From 7720cf02e39582182060704f844d34c5d9e9f4d5 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Fri, 23 Dec 2016 19:39:20 +1300 Subject: Change --crate-type metadata to --emit=metadata --- src/test/compile-fail/auxiliary/rmeta_meta.rs | 3 ++- src/test/compile-fail/rmeta-lib-pass.rs | 3 +-- src/test/compile-fail/rmeta-pass.rs | 3 +-- src/test/compile-fail/rmeta.rs | 3 +-- src/test/compile-fail/rmeta_meta_main.rs | 2 +- src/test/run-pass/auxiliary/rmeta_rmeta.rs | 3 ++- 6 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/test') diff --git a/src/test/compile-fail/auxiliary/rmeta_meta.rs b/src/test/compile-fail/auxiliary/rmeta_meta.rs index 7bd1a96f452..4207fc2373b 100644 --- a/src/test/compile-fail/auxiliary/rmeta_meta.rs +++ b/src/test/compile-fail/auxiliary/rmeta_meta.rs @@ -9,8 +9,9 @@ // except according to those terms. // no-prefer-dynamic +// compile-flags: --emit=metadata -#![crate_type="metadata"] +#![crate_type="rlib"] pub struct Foo { pub field: i32, diff --git a/src/test/compile-fail/rmeta-lib-pass.rs b/src/test/compile-fail/rmeta-lib-pass.rs index f2ac37a2ce9..dde559b018c 100644 --- a/src/test/compile-fail/rmeta-lib-pass.rs +++ b/src/test/compile-fail/rmeta-lib-pass.rs @@ -8,6 +8,7 @@ // 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 // must-compile-successfully @@ -15,8 +16,6 @@ // Check that building a metadata crate works with a dependent, rlib crate. // This is a cfail test since there is no executable to run. -#![crate_type="metadata"] - extern crate rmeta_rlib; use rmeta_rlib::Foo; diff --git a/src/test/compile-fail/rmeta-pass.rs b/src/test/compile-fail/rmeta-pass.rs index 2c0b6f77c1e..5b24da79a7e 100644 --- a/src/test/compile-fail/rmeta-pass.rs +++ b/src/test/compile-fail/rmeta-pass.rs @@ -8,6 +8,7 @@ // 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 // must-compile-successfully @@ -16,8 +17,6 @@ // crate. // This is a cfail test since there is no executable to run. -#![crate_type="metadata"] - extern crate rmeta_meta; use rmeta_meta::Foo; diff --git a/src/test/compile-fail/rmeta.rs b/src/test/compile-fail/rmeta.rs index 455574bbb9d..edcf98d9964 100644 --- a/src/test/compile-fail/rmeta.rs +++ b/src/test/compile-fail/rmeta.rs @@ -9,11 +9,10 @@ // except according to those terms. // no-prefer-dynamic +// compile-flags: --emit=metadata // Check that building a metadata crate finds an error. -#![crate_type="metadata"] - fn main() { let _ = Foo; //~ ERROR unresolved value `Foo` } diff --git a/src/test/compile-fail/rmeta_meta_main.rs b/src/test/compile-fail/rmeta_meta_main.rs index 1c922c28139..ffeb5bc3b85 100644 --- a/src/test/compile-fail/rmeta_meta_main.rs +++ b/src/test/compile-fail/rmeta_meta_main.rs @@ -8,13 +8,13 @@ // 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 // Check that building a metadata crate finds an error with a dependent, // metadata-only crate. -#![crate_type="metadata"] extern crate rmeta_meta; use rmeta_meta::Foo; diff --git a/src/test/run-pass/auxiliary/rmeta_rmeta.rs b/src/test/run-pass/auxiliary/rmeta_rmeta.rs index 394845b66f3..c3cfe89ee5c 100644 --- a/src/test/run-pass/auxiliary/rmeta_rmeta.rs +++ b/src/test/run-pass/auxiliary/rmeta_rmeta.rs @@ -9,8 +9,9 @@ // except according to those terms. // no-prefer-dynamic +// compile-flags: --emit=metadata -#![crate_type="metadata"] +#![crate_type="rlib"] #![crate_name="rmeta_aux"] pub struct Foo { -- cgit 1.4.1-3-g733a5 From 71f161c8876fd7996503a7bd7d499c6e67bf956e Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Wed, 28 Dec 2016 09:35:48 +1300 Subject: Add a test for #38273 Closes 38273 --- src/test/compile-fail/rmeta-priv-warn.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/test/compile-fail/rmeta-priv-warn.rs (limited to 'src/test') diff --git a/src/test/compile-fail/rmeta-priv-warn.rs b/src/test/compile-fail/rmeta-priv-warn.rs new file mode 100644 index 00000000000..3e7019e0ccc --- /dev/null +++ b/src/test/compile-fail/rmeta-priv-warn.rs @@ -0,0 +1,21 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.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 +// must-compile-successfully + +#[deny(warnings)] + +// Test that we don't get warnings for non-pub main when only emitting metadata. +// (#38273) + +fn main() { +} -- cgit 1.4.1-3-g733a5