user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #50911 - petrochenkov:macuse, r=alexcrichton

Browse source 
Stabilize `use_extern_macros`

Closes https://github.com/rust-lang/rust/issues/35896
This commit is contained in:
bors 2018-08-17 19:10:34 +00:00
commit c8c587fe4e
87 changed files with 172 additions and 532 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs
View file

@ -11,8 +11,6 @@
// aux-build:attribute-with-error.rs
// ignore-stage1
#![feature(use_extern_macros)]
extern crate attribute_with_error;
use attribute_with_error::foo;

1
src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs
View file

@ -12,7 +12,6 @@
// ignore-stage1
// compile-pass
#![feature(use_extern_macros)]
#![warn(unused)]
extern crate attributes_included;

1
src/test/compile-fail-fulldeps/proc-macro/issue-41211.rs
View file

@ -13,7 +13,6 @@
// FIXME: https://github.com/rust-lang/rust/issues/41430
// This is a temporary regression test for the ICE reported in #41211
#![feature(use_extern_macros)]
#![emit_unchanged]
//~^ ERROR attribute `emit_unchanged` is currently unknown to the compiler
extern crate issue_41211;

1
src/test/compile-fail-fulldeps/proc-macro/macro-use-attr.rs
View file

@ -9,7 +9,6 @@
// except according to those terms.
// aux-build:attr_proc_macro.rs
#![feature(use_extern_macros)]
#[macro_use] extern crate attr_proc_macro;

2
src/test/compile-fail-fulldeps/proc-macro/macros-in-extern.rs
View file

@ -12,8 +12,6 @@
// ignore-stage1
// ignore-wasm32
#![feature(use_extern_macros)]
extern crate test_macros;
use test_macros::{nop_attr, no_output, emit_input};

2
src/test/compile-fail-fulldeps/proc-macro/more-gates.rs
View file

@ -10,8 +10,6 @@
// aux-build:more-gates.rs
#![feature(use_extern_macros)]
extern crate more_gates as foo;
use foo::*;

3
src/test/compile-fail-fulldeps/proc-macro/no-macro-use-attr.rs
View file

@ -11,9 +11,10 @@
// aux-build:derive-a.rs
#![feature(rustc_attrs)]
#![warn(unused_extern_crates)]
extern crate derive_a;
//~^ WARN proc macro crates and `#[no_link]` crates have no effect without `#[macro_use]`
//~^ WARN unused extern crate
#[rustc_error]
fn main() {} //~ ERROR compilation successful

6
src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs
View file

@ -17,11 +17,11 @@
extern crate derive_b;
#[derive(B)]
#[B]
#[C] //~ ERROR: The attribute `C` is currently unknown to the compiler
#[B] //~ ERROR `B` is a derive mode
#[C]
#[B(D)]
#[B(E = "foo")]
#[B(arbitrary tokens)] //~ ERROR expected one of `(`, `)`, `,`, `::`, or `=`, found `tokens`
#[B(arbitrary tokens)]
struct B;
fn main() {}

1
src/test/run-pass-fulldeps/proc-macro/attr-args.rs
View file

@ -12,7 +12,6 @@
// ignore-stage1
#![allow(warnings)]
#![feature(use_extern_macros)]
extern crate attr_args;
use attr_args::{attr_with_args, identity};

2
src/test/run-pass-fulldeps/proc-macro/attr-cfg.rs
View file

@ -12,8 +12,6 @@
// ignore-stage1
// revisions: foo bar
#![feature(use_extern_macros)]
extern crate attr_cfg;
use attr_cfg::attr_cfg;

2
src/test/run-pass-fulldeps/proc-macro/attr-on-trait.rs
View file

@ -11,8 +11,6 @@
// aux-build:attr-on-trait.rs
// ignore-stage1
#![feature(use_extern_macros)]
extern crate attr_on_trait;
use attr_on_trait::foo;

2
src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example.rs
View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(use_extern_macros)]
extern crate hygiene_example_codegen;
pub use hygiene_example_codegen::hello;

2
src/test/run-pass-fulldeps/proc-macro/derive-attr-cfg.rs
View file

@ -11,8 +11,6 @@
// aux-build:derive-attr-cfg.rs
// ignore-stage1
#![feature(use_extern_macros)]
extern crate derive_attr_cfg;
use derive_attr_cfg::Foo;

2
src/test/run-pass-fulldeps/proc-macro/derive-two-attrs.rs
View file

@ -10,8 +10,6 @@
// aux-build:derive-two-attrs.rs
#![feature(use_extern_macros)]
extern crate derive_two_attrs as foo;
use foo::A;

2
src/test/run-pass-fulldeps/proc-macro/gen-lifetime-token.rs
View file

@ -10,8 +10,6 @@
// aux-build:gen-lifetime-token.rs
#![feature(use_extern_macros)]
extern crate gen_lifetime_token as bar;
bar::bar!();

3
src/test/run-pass-fulldeps/proc-macro/issue-39889.rs
View file

@ -11,9 +11,6 @@
// aux-build:issue-39889.rs
// ignore-stage1
#![feature(use_extern_macros)]
#![allow(unused)]
extern crate issue_39889;
use issue_39889::Issue39889;

2
src/test/run-pass-fulldeps/proc-macro/lifetimes.rs
View file

@ -11,8 +11,6 @@
// aux-build:lifetimes.rs
// ignore-stage1
#![feature(use_extern_macros)]
extern crate lifetimes;
use lifetimes::*;

2
src/test/run-pass-fulldeps/proc-macro/modify-ast.rs
View file

@ -10,8 +10,6 @@
// aux-build:modify-ast.rs
#![feature(use_extern_macros)]
extern crate modify_ast;
use modify_ast::*;

2
src/test/run-pass-fulldeps/proc-macro/not-joint.rs
View file

@ -10,8 +10,6 @@
// aux-build:not-joint.rs
#![feature(use_extern_macros)]
extern crate not_joint as bar;
use bar::{tokens, nothing};

2
src/test/run-pass-fulldeps/proc-macro/span-api-tests.rs
View file

@ -13,8 +13,6 @@
// ignore-pretty
#![feature(use_extern_macros)]
#[macro_use]
extern crate span_test_macros;

1
src/test/run-pass/auxiliary/issue_38715-modern.rs
View file

@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(use_extern_macros)]
#![allow(duplicate_macro_exports)]
#[macro_export]

102
src/test/run-pass/macro-comma-support.rs
View file

@ -61,30 +61,30 @@ fn assert_ne() {
#[test]
fn cfg() {
let _ = cfg!(pants);
let _ = cfg!(pants,);
let _ = cfg!(pants = "pants");
let _ = cfg!(pants = "pants",);
let _ = cfg!(all(pants));
let _ = cfg!(all(pants),);
let _ = cfg!(all(pants,));
let _ = cfg!(all(pants,),);
cfg!(pants);
cfg!(pants,);
cfg!(pants = "pants");
cfg!(pants = "pants",);
cfg!(all(pants));
cfg!(all(pants),);
cfg!(all(pants,));
cfg!(all(pants,),);
}
#[test]
fn column() {
let _ = column!();
column!();
}
// compile_error! is in a companion to this test in compile-fail
#[test]
fn concat() {
let _ = concat!();
let _ = concat!("hello");
let _ = concat!("hello",);
let _ = concat!("hello", " world");
let _ = concat!("hello", " world",);
concat!();
concat!("hello");
concat!("hello",);
concat!("hello", " world");
concat!("hello", " world",);
}
#[test]
@ -130,10 +130,10 @@ fn debug_assert_ne() {
#[test]
fn env() {
let _ = env!("PATH");
let _ = env!("PATH",);
let _ = env!("PATH", "not found");
let _ = env!("PATH", "not found",);
env!("PATH");
env!("PATH",);
env!("PATH", "not found");
env!("PATH", "not found",);
}
#[cfg(std)]
@ -157,58 +157,58 @@ fn eprintln() {
#[test]
fn file() {
let _ = file!();
file!();
}
#[cfg(std)]
#[test]
fn format() {
let _ = format!("hello");
let _ = format!("hello",);
let _ = format!("hello {}", "world");
let _ = format!("hello {}", "world",);
format!("hello");
format!("hello",);
format!("hello {}", "world");
format!("hello {}", "world",);
}
#[test]
fn format_args() {
let _ = format_args!("hello");
let _ = format_args!("hello",);
let _ = format_args!("hello {}", "world");
let _ = format_args!("hello {}", "world",);
format_args!("hello");
format_args!("hello",);
format_args!("hello {}", "world");
format_args!("hello {}", "world",);
}
#[test]
fn include() {
let _ = include!("auxiliary/macro-comma-support.rs");
let _ = include!("auxiliary/macro-comma-support.rs",);
include!("auxiliary/macro-comma-support.rs");
include!("auxiliary/macro-comma-support.rs",);
}
#[test]
fn include_bytes() {
let _ = include_bytes!("auxiliary/macro-comma-support.rs");
let _ = include_bytes!("auxiliary/macro-comma-support.rs",);
include_bytes!("auxiliary/macro-comma-support.rs");
include_bytes!("auxiliary/macro-comma-support.rs",);
}
#[test]
fn include_str() {
let _ = include_str!("auxiliary/macro-comma-support.rs");
let _ = include_str!("auxiliary/macro-comma-support.rs",);
include_str!("auxiliary/macro-comma-support.rs");
include_str!("auxiliary/macro-comma-support.rs",);
}
#[test]
fn line() {
let _ = line!();
line!();
}
#[test]
fn module_path() {
let _ = module_path!();
module_path!();
}
#[test]
fn option_env() {
let _ = option_env!("PATH");
let _ = option_env!("PATH",);
option_env!("PATH");
option_env!("PATH",);
}
#[test]
@ -308,10 +308,10 @@ fn unreachable() {
#[test]
fn vec() {
let _: Vec<()> = vec![];
let _ = vec![0];
let _ = vec![0,];
let _ = vec![0, 1];
let _ = vec![0, 1,];
vec![0];
vec![0,];
vec![0, 1];
vec![0, 1,];
}
// give a test body access to a fmt::Formatter, which seems
@ -339,21 +339,21 @@ macro_rules! test_with_formatter {
test_with_formatter! {
#[test]
fn write(f: &mut fmt::Formatter) {
let _ = write!(f, "hello");
let _ = write!(f, "hello",);
let _ = write!(f, "hello {}", "world");
let _ = write!(f, "hello {}", "world",);
write!(f, "hello");
write!(f, "hello",);
write!(f, "hello {}", "world");
write!(f, "hello {}", "world",);
}
}
test_with_formatter! {
#[test]
fn writeln(f: &mut fmt::Formatter) {
let _ = writeln!(f);
let _ = writeln!(f,);
let _ = writeln!(f, "hello");
let _ = writeln!(f, "hello",);
let _ = writeln!(f, "hello {}", "world");
let _ = writeln!(f, "hello {}", "world",);
writeln!(f);
writeln!(f,);
writeln!(f, "hello");
writeln!(f, "hello",);
writeln!(f, "hello {}", "world");
writeln!(f, "hello {}", "world",);
}
}

2
src/test/run-pass/paths-in-macro-invocations.rs
View file

@ -10,8 +10,6 @@
// aux-build:two_macros.rs
#![feature(use_extern_macros)]
extern crate two_macros;
::two_macros::macro_one!();

2
src/test/run-pass/use-macro-self.rs
View file

@ -10,8 +10,6 @@
// aux-build:use-macro-self.rs
#![feature(use_extern_macros)]
#[macro_use]
extern crate use_macro_self;

2
src/test/rustdoc/cross-crate-links.rs
View file

@ -11,8 +11,6 @@
// aux-build:all-item-types.rs
// build-aux-docs
#![feature(use_extern_macros)]
#![crate_name = "foo"]
#[macro_use]

2
src/test/rustdoc/inline_cross/macro-vis.rs
View file

@ -12,8 +12,6 @@
// build-aux-docs
// ignore-cross-compile
#![feature(use_extern_macros)]
#[macro_use] extern crate qwop;
// @has macro_vis/macro.some_macro.html

1
src/test/rustdoc/inline_cross/macros.rs
View file

@ -12,7 +12,6 @@
// build-aux-docs
#![feature(macro_test)]
#![feature(use_extern_macros)]
#![crate_name = "foo"]

2
src/test/rustdoc/pub-use-extern-macros.rs
View file

@ -10,8 +10,6 @@
// aux-build:pub-use-extern-macros.rs
#![feature(use_extern_macros)]
extern crate macros;
// @has pub_use_extern_macros/macro.bar.html

2
src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.rs
View file

@ -10,8 +10,6 @@
// aux-build:attribute-spans-preserved.rs
#![feature(use_extern_macros)]
extern crate attribute_spans_preserved as foo;
use foo::foo;

4
src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/attribute-spans-preserved.rs:19:23
--> $DIR/attribute-spans-preserved.rs:17: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:20:23
--> $DIR/attribute-spans-preserved.rs:18:23
|
LL | #[ bar { let x: u32 = "y"; } ] //~ ERROR: mismatched types
| ^^^ expected u32, found reference

2
src/test/ui-fulldeps/proc-macro/macro-brackets.rs
View file

@ -10,8 +10,6 @@
// aux-build:macro-brackets.rs
#![feature(use_extern_macros)]
extern crate macro_brackets as bar;
use bar::doit;

2
src/test/ui-fulldeps/proc-macro/macro-brackets.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/macro-brackets.rs:23:21
--> $DIR/macro-brackets.rs:21:21
|
LL | id![static X: u32 = 'a';]; //~ ERROR: mismatched types
| ^^^ expected u32, found char

1
src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.rs
View file

@ -10,7 +10,6 @@
// no-prefer-dynamic
#![feature(use_extern_macros)]
#![crate_type = "proc-macro"]
extern crate proc_macro;

18
src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.stderr
View file

@ -1,53 +1,53 @@
error: can't use a procedural macro from the same crate that defines it
--> $DIR/macro-namespace-reserved-2.rs:35:5
--> $DIR/macro-namespace-reserved-2.rs:34: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:38:5
--> $DIR/macro-namespace-reserved-2.rs:37: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:41:5
--> $DIR/macro-namespace-reserved-2.rs:40: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:44:1
--> $DIR/macro-namespace-reserved-2.rs:43:1
|
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:46:1
--> $DIR/macro-namespace-reserved-2.rs:45:1
|
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:48:1
--> $DIR/macro-namespace-reserved-2.rs:47:1
|
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:51:10
--> $DIR/macro-namespace-reserved-2.rs:50: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:53:10
--> $DIR/macro-namespace-reserved-2.rs:52: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:55:10
--> $DIR/macro-namespace-reserved-2.rs:54:10
|
LL | #[derive(MyTrait)] //~ ERROR can't use a procedural macro from the same crate that defines it
| ^^^^^^^

2
src/test/ui-fulldeps/proc-macro/nested-item-spans.rs
View file

@ -10,8 +10,6 @@
// aux-build:nested-item-spans.rs
#![feature(use_extern_macros)]
extern crate nested_item_spans;
use nested_item_spans::foo;

4
src/test/ui-fulldeps/proc-macro/nested-item-spans.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/nested-item-spans.rs:22:22
--> $DIR/nested-item-spans.rs:20: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:31:22
--> $DIR/nested-item-spans.rs:29:22
|
LL | let x: u32 = "x"; //~ ERROR: mismatched types
| ^^^ expected u32, found reference

2
src/test/ui/duplicate/duplicate-check-macro-exports.rs
View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(use_extern_macros)]
pub use std::panic;
#[macro_export]

2
src/test/ui/duplicate/duplicate-check-macro-exports.stderr
View file

@ -1,5 +1,5 @@
error[E0255]: the name `panic` is defined multiple times
--> $DIR/duplicate-check-macro-exports.rs:16:1
--> $DIR/duplicate-check-macro-exports.rs:14:1
|
LL | pub use std::panic;
| ---------- previous import of the macro `panic` here

2
src/test/ui/extern/extern-macro.rs vendored
View file

@ -10,8 +10,6 @@
// #41719
#![feature(use_extern_macros)]
fn main() {
enum Foo {}
let _ = Foo::bar!(); //~ ERROR fail to resolve non-ident macro path

2
src/test/ui/extern/extern-macro.stderr vendored
View file

@ -1,5 +1,5 @@
error: fail to resolve non-ident macro path
--> $DIR/extern-macro.rs:17:13
--> $DIR/extern-macro.rs:15:13
|
LL | let _ = Foo::bar!(); //~ ERROR fail to resolve non-ident macro path
| ^^^^^^^^

2
src/test/ui/feature-gates/feature-gate-tool_attributes.rs
View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(use_extern_macros)]
fn main() {
#[rustfmt::skip] //~ ERROR tool attributes are unstable
let x = 3

2
src/test/ui/feature-gates/feature-gate-tool_attributes.stderr
View file

@ -1,5 +1,5 @@
error[E0658]: tool attributes are unstable (see issue #44690)
--> $DIR/feature-gate-tool_attributes.rs:14:5
--> $DIR/feature-gate-tool_attributes.rs:12:5
|
LL | #[rustfmt::skip] //~ ERROR tool attributes are unstable
| ^^^^^^^^^^^^^^^^

2
src/test/ui/hygiene/local_inner_macros.rs
View file

@ -11,8 +11,6 @@
// compile-pass
// aux-build:local_inner_macros.rs
#![feature(use_extern_macros)]
extern crate local_inner_macros;
use local_inner_macros::{public_macro, public_macro_dynamic};

20
src/test/ui/hygiene/local_inner_macros_disabled.rs
View file

@ -1,20 +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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// `local_inner_macros` has no effect if `feature(use_extern_macros)` is not enabled
// aux-build:local_inner_macros.rs
#[macro_use(public_macro)]
extern crate local_inner_macros;
public_macro!(); //~ ERROR cannot find macro `helper2!` in this scope
fn main() {}

10
src/test/ui/hygiene/local_inner_macros_disabled.stderr
View file

@ -1,10 +0,0 @@
error: cannot find macro `helper2!` in this scope
--> $DIR/local_inner_macros_disabled.rs:18:1
|
LL | public_macro!(); //~ ERROR cannot find macro `helper2!` in this scope
| ^^^^^^^^^^^^^^^^
|
= 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: aborting due to previous error

2
src/test/ui/imports/local-modularized-tricky-fail-3.rs
View file

@ -10,8 +10,6 @@
// Crate-local macro expanded `macro_export` macros cannot be accessed with module-relative paths.
#![feature(use_extern_macros)]
macro_rules! define_exported { () => {
#[macro_export]
macro_rules! exported {

8
src/test/ui/imports/local-modularized-tricky-fail-3.stderr
View file

@ -1,11 +1,11 @@
error: macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths
--> $DIR/local-modularized-tricky-fail-3.rs:25:9
--> $DIR/local-modularized-tricky-fail-3.rs:23:9
|
LL | use exported;
| ^^^^^^^^
|
note: the macro is defined here
--> $DIR/local-modularized-tricky-fail-3.rs:17:5
--> $DIR/local-modularized-tricky-fail-3.rs:15:5
|
LL | / macro_rules! exported {
LL | | () => ()
@ -16,13 +16,13 @@ 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:30:5
--> $DIR/local-modularized-tricky-fail-3.rs:28:5
|
LL | ::exported!();
| ^^^^^^^^^^
|
note: the macro is defined here
--> $DIR/local-modularized-tricky-fail-3.rs:17:5
--> $DIR/local-modularized-tricky-fail-3.rs:15:5
|
LL | / macro_rules! exported {
LL | | () => ()

2
src/test/ui/imports/local-modularized-tricky-pass.rs
View file

@ -10,8 +10,6 @@
// compile-pass
#![feature(use_extern_macros)]
macro_rules! define_exported { () => {
#[macro_export]
macro_rules! exported {

2
src/test/ui/imports/local-modularized.rs
View file

@ -10,8 +10,6 @@
// compile-pass
#![feature(use_extern_macros)]
#[macro_export(local_inner_macros)]
macro_rules! dollar_crate_exported {
(1) => { $crate::exported!(); };

2
src/test/ui/imports/macro-paths.rs
View file

@ -10,8 +10,6 @@
// aux-build:two_macros.rs
#![feature(use_extern_macros)]
extern crate two_macros;
mod foo {

12
src/test/ui/imports/macro-paths.stderr
View file

@ -1,34 +1,34 @@
error[E0659]: `bar` is ambiguous
--> $DIR/macro-paths.rs:25:5
--> $DIR/macro-paths.rs:23:5
|
LL | bar::m! { //~ ERROR ambiguous
| ^^^^^^
|
note: `bar` could refer to the name defined here
--> $DIR/macro-paths.rs:26:9
--> $DIR/macro-paths.rs:24:9
|
LL | mod bar { pub use two_macros::m; }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: `bar` could also refer to the name imported here
--> $DIR/macro-paths.rs:24:9
--> $DIR/macro-paths.rs:22: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:35:5
--> $DIR/macro-paths.rs:33:5
|
LL | baz::m! { //~ ERROR ambiguous
| ^^^^^^
|
note: `baz` could refer to the name defined here
--> $DIR/macro-paths.rs:36:9
--> $DIR/macro-paths.rs:34:9
|
LL | mod baz { pub use two_macros::m; }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: `baz` could also refer to the name defined here
--> $DIR/macro-paths.rs:30:1
--> $DIR/macro-paths.rs:28:1
|
LL | / pub mod baz {
LL | | pub use two_macros::m;

2
src/test/ui/imports/macros.rs
View file

@ -10,8 +10,6 @@
// aux-build:two_macros.rs
#![feature(use_extern_macros)]
extern crate two_macros; // two identity macros `m` and `n`
mod foo {

18
src/test/ui/imports/macros.stderr
View file

@ -1,51 +1,51 @@
error: `m` is ambiguous
--> $DIR/macros.rs:50:5
--> $DIR/macros.rs:48:5
|
LL | m!(); //~ ERROR ambiguous
| ^
|
note: `m` could refer to the macro defined here
--> $DIR/macros.rs:48:5
--> $DIR/macros.rs:46:5
|
LL | macro_rules! m { () => {} }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: `m` could also refer to the macro imported here
--> $DIR/macros.rs:49:9
--> $DIR/macros.rs:47:9
|
LL | use two_macros::m;
| ^^^^^^^^^^^^^
error[E0659]: `m` is ambiguous
--> $DIR/macros.rs:28:5
--> $DIR/macros.rs:26:5
|
LL | m! { //~ ERROR ambiguous
| ^
|
note: `m` could refer to the name imported here
--> $DIR/macros.rs:29:13
--> $DIR/macros.rs:27:13
|
LL | use foo::m;
| ^^^^^^
note: `m` could also refer to the name imported here
--> $DIR/macros.rs:27:9
--> $DIR/macros.rs:25:9
|
LL | use two_macros::*;
| ^^^^^^^^^^^^^
= note: macro-expanded macro imports do not shadow
error[E0659]: `m` is ambiguous
--> $DIR/macros.rs:41:9
--> $DIR/macros.rs:39:9
|
LL | m! { //~ ERROR ambiguous
| ^
|
note: `m` could refer to the name imported here
--> $DIR/macros.rs:42:17
--> $DIR/macros.rs:40:17
|
LL | use two_macros::n as m;
| ^^^^^^^^^^^^^^^^^^
note: `m` could also refer to the name imported here
--> $DIR/macros.rs:34:9
--> $DIR/macros.rs:32:9
|
LL | use two_macros::m;
| ^^^^^^^^^^^^^

2
src/test/ui/imports/shadow_builtin_macros.rs
View file

@ -10,8 +10,6 @@
// aux-build:two_macros.rs
#![feature(use_extern_macros)]
mod foo {
extern crate two_macros;
pub use self::two_macros::m as panic;

16
src/test/ui/imports/shadow_builtin_macros.stderr
View file

@ -1,5 +1,5 @@
error: `panic` is already in scope
--> $DIR/shadow_builtin_macros.rs:42:9
--> $DIR/shadow_builtin_macros.rs:40:9
|
LL | macro_rules! panic { () => {} } //~ ERROR `panic` is already in scope
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -10,13 +10,13 @@ LL | m!();
= note: macro-expanded `macro_rules!`s may not shadow existing macros (see RFC 1560)
error[E0659]: `panic` is ambiguous
--> $DIR/shadow_builtin_macros.rs:27:14
--> $DIR/shadow_builtin_macros.rs:25:14
|
LL | fn f() { panic!(); } //~ ERROR ambiguous
| ^^^^^
|
note: `panic` could refer to the name imported here
--> $DIR/shadow_builtin_macros.rs:26:9
--> $DIR/shadow_builtin_macros.rs:24:9
|
LL | use foo::*;
| ^^^^^^
@ -24,13 +24,13 @@ LL | use foo::*;
= note: consider adding an explicit import of `panic` to disambiguate
error[E0659]: `panic` is ambiguous
--> $DIR/shadow_builtin_macros.rs:32:14
--> $DIR/shadow_builtin_macros.rs:30:14
|
LL | fn f() { panic!(); } //~ ERROR ambiguous
| ^^^^^
|
note: `panic` could refer to the name imported here
--> $DIR/shadow_builtin_macros.rs:31:26
--> $DIR/shadow_builtin_macros.rs:29:26
|
LL | ::two_macros::m!(use foo::panic;);
| ^^^^^^^^^^
@ -38,18 +38,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:61:5
--> $DIR/shadow_builtin_macros.rs:59:5
|
LL | n!(); //~ ERROR ambiguous
| ^
|
note: `n` could refer to the name imported here
--> $DIR/shadow_builtin_macros.rs:60:9
--> $DIR/shadow_builtin_macros.rs:58:9
|
LL | use bar::*;
| ^^^^^^
note: `n` could also refer to the name imported here
--> $DIR/shadow_builtin_macros.rs:48:13
--> $DIR/shadow_builtin_macros.rs:46:13
|
LL | #[macro_use(n)]
| ^

1
src/test/ui/issues/issue-49074.rs
View file

@ -20,5 +20,4 @@ mod foo {
fn main() {
bar!();
//~^ ERROR cannot find macro `bar!`
}

10
src/test/ui/issues/issue-49074.stderr
View file

@ -1,11 +1,3 @@
error: cannot find macro `bar!` in this scope
--> $DIR/issue-49074.rs:22:4
|
LL | bar!();
| ^^^
|
= help: have you added the `#[macro_use]` on the module/import?
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:1
|
@ -14,6 +6,6 @@ LL | #[marco_use] // typo
|
= help: add #![feature(custom_attribute)] to the crate attributes to enable
error: aborting due to 2 previous errors
error: aborting due to previous error
For more information about this error, try `rustc --explain E0658`.

2
src/test/ui/macros/macro-path-prelude-fail-1.rs
View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(use_extern_macros, extern_prelude)]
#![feature(extern_prelude)]
mod m {
fn check() {

2
src/test/ui/macros/macro-path-prelude-fail-2.rs
View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(use_extern_macros)]
mod m {
fn check() {
Result::Ok!(); //~ ERROR fail to resolve non-ident macro path

2
src/test/ui/macros/macro-path-prelude-fail-2.stderr
View file

@ -1,5 +1,5 @@
error: fail to resolve non-ident macro path
--> $DIR/macro-path-prelude-fail-2.rs:15:9
--> $DIR/macro-path-prelude-fail-2.rs:13:9
|
LL | Result::Ok!(); //~ ERROR fail to resolve non-ident macro path
| ^^^^^^^^^^

2
src/test/ui/macros/macro-path-prelude-fail-3.rs
View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(use_extern_macros)]
#[derive(inline)] //~ ERROR cannot find derive macro `inline` in this scope
struct S;

4
src/test/ui/macros/macro-path-prelude-fail-3.stderr
View file

@ -1,11 +1,11 @@
error: cannot find derive macro `inline` in this scope
--> $DIR/macro-path-prelude-fail-3.rs:13:10
--> $DIR/macro-path-prelude-fail-3.rs:11: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:17:5
--> $DIR/macro-path-prelude-fail-3.rs:15:5
|
LL | inline!(); //~ ERROR cannot find macro `inline!` in this scope
| ^^^^^^ help: you could try the macro: `line`

2
src/test/ui/macros/macro-path-prelude-pass.rs
View file

@ -10,7 +10,7 @@
// compile-pass
#![feature(use_extern_macros, extern_prelude)]
#![feature(extern_prelude)]
mod m {
fn check() {

2
src/test/ui/macros/macro-reexport-removed.stderr
View file

@ -4,7 +4,7 @@ error[E0557]: feature has been removed
LL | #![feature(macro_reexport)] //~ ERROR feature has been removed
| ^^^^^^^^^^^^^^
|
note: subsumed by `#![feature(use_extern_macros)]` and `pub use`
note: subsumed by `pub use`
--> $DIR/macro-reexport-removed.rs:13:12
|
LL | #![feature(macro_reexport)] //~ ERROR feature has been removed

15
src/test/ui/macros/macro-with-seps-err-msg.rs
View file

@ -1,15 +0,0 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// gate-test-use_extern_macros
fn main() {
globnar::brotz!(); //~ ERROR non-ident macro paths are experimental
}

11
src/test/ui/macros/macro-with-seps-err-msg.stderr
View file

@ -1,11 +0,0 @@
error[E0658]: non-ident macro paths are experimental (see issue #35896)
--> $DIR/macro-with-seps-err-msg.rs:14:5
|
LL | globnar::brotz!(); //~ ERROR non-ident macro paths are experimental
| ^^^^^^^^^^^^^^
|
= help: add #![feature(use_extern_macros)] to the crate attributes to enable
error: aborting due to previous error
For more information about this error, try `rustc --explain E0658`.

2
src/test/ui/macros/macro_undefined.rs
View file

@ -19,5 +19,5 @@ mod m {
fn main() {
k!(); //~ ERROR cannot find
kl!(); //~ ERROR cannot find
kl!();
}

10
src/test/ui/macros/macro_undefined.stderr
View file

@ -1,16 +1,8 @@
error: cannot find macro `kl!` in this scope
--> $DIR/macro_undefined.rs:22:5
|
LL | kl!(); //~ ERROR cannot find
| ^^
|
= help: have you added the `#[macro_use]` on the module/import?
error: cannot find macro `k!` in this scope
--> $DIR/macro_undefined.rs:21:5
|
LL | k!(); //~ ERROR cannot find
| ^ help: you could try the macro: `kl`
error: aborting due to 2 previous errors
error: aborting due to previous error

2
src/test/ui/macros/macros-nonfatal-errors.rs
View file

@ -30,8 +30,6 @@ fn main() {
env!(foo, abr, baz); //~ ERROR
env!("RUST_HOPEFULLY_THIS_DOESNT_EXIST"); //~ ERROR
foo::blah!(); //~ ERROR
format!(invalid); //~ ERROR
include!(invalid); //~ ERROR

27
src/test/ui/macros/macros-nonfatal-errors.stderr
View file

@ -40,16 +40,8 @@ error: environment variable `RUST_HOPEFULLY_THIS_DOESNT_EXIST` not defined
LL | env!("RUST_HOPEFULLY_THIS_DOESNT_EXIST"); //~ ERROR
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0658]: non-ident macro paths are experimental (see issue #35896)
--> $DIR/macros-nonfatal-errors.rs:33:5
|
LL | foo::blah!(); //~ ERROR
| ^^^^^^^^^
|
= help: add #![feature(use_extern_macros)] to the crate attributes to enable
error: format argument must be a string literal
--> $DIR/macros-nonfatal-errors.rs:35:13
--> $DIR/macros-nonfatal-errors.rs:33:13
|
LL | format!(invalid); //~ ERROR
| ^^^^^^^
@ -59,42 +51,41 @@ LL | format!("{}", invalid); //~ ERROR
| ^^^^^
error: argument must be a string literal
--> $DIR/macros-nonfatal-errors.rs:37:14
--> $DIR/macros-nonfatal-errors.rs:35:14
|
LL | include!(invalid); //~ ERROR
| ^^^^^^^
error: argument must be a string literal
--> $DIR/macros-nonfatal-errors.rs:39:18
--> $DIR/macros-nonfatal-errors.rs:37: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:40:5
--> $DIR/macros-nonfatal-errors.rs:38: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:41:20
--> $DIR/macros-nonfatal-errors.rs:39: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:42:5
--> $DIR/macros-nonfatal-errors.rs:40: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:44:5
--> $DIR/macros-nonfatal-errors.rs:42:5
|
LL | trace_macros!(invalid); //~ ERROR
| ^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 15 previous errors
error: aborting due to 14 previous errors
Some errors occurred: E0658, E0665.
For more information about an error, try `rustc --explain E0658`.
For more information about this error, try `rustc --explain E0665`.

1
src/test/ui/no-link.rs
View file

@ -12,7 +12,6 @@
#[no_link]
extern crate empty_struct;
//~^ WARN proc macro crates and `#[no_link]` crates have no effect without `#[macro_use]`
fn main() {
empty_struct::XEmpty1; //~ ERROR cannot find value `XEmpty1` in module `empty_struct`

8
src/test/ui/no-link.stderr
View file

@ -1,11 +1,5 @@
warning: proc macro crates and `#[no_link]` crates have no effect without `#[macro_use]`
--> $DIR/no-link.rs:14:1
|
LL | extern crate empty_struct;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0425]: cannot find value `XEmpty1` in module `empty_struct`
--> $DIR/no-link.rs:18:19
--> $DIR/no-link.rs:17:19
|
LL | empty_struct::XEmpty1; //~ ERROR cannot find value `XEmpty1` in module `empty_struct`
| ^^^^^^^ not found in `empty_struct`

64
src/test/ui/object-lifetime/object-lifetime-default.stderr
View file

@ -1,32 +1,8 @@
error: BaseDefault
--> $DIR/object-lifetime-default.rs:16:1
error: 'a,Ambiguous
--> $DIR/object-lifetime-default.rs:34:1
|
LL | struct A<T>(T); //~ ERROR BaseDefault
| ^^^^^^^^^^^^^^^
error: BaseDefault
--> $DIR/object-lifetime-default.rs:19:1
|
LL | struct B<'a,T>(&'a (), T); //~ ERROR BaseDefault
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
error: 'a
--> $DIR/object-lifetime-default.rs:22:1
|
LL | struct C<'a,T:'a>(&'a T); //~ ERROR 'a
| ^^^^^^^^^^^^^^^^^^^^^^^^^
error: Ambiguous
--> $DIR/object-lifetime-default.rs:25:1
|
LL | struct D<'a,'b,T:'a+'b>(&'a T, &'b T); //~ ERROR Ambiguous
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: 'b
--> $DIR/object-lifetime-default.rs:28:1
|
LL | struct E<'a,'b:'a,T:'b>(&'a T, &'b T); //~ ERROR 'b
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
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
@ -34,11 +10,35 @@ error: 'a,'b
LL | struct F<'a,'b,T:'a,U:'b>(&'a T, &'b U); //~ ERROR 'a,'b
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: 'a,Ambiguous
--> $DIR/object-lifetime-default.rs:34:1
error: 'b
--> $DIR/object-lifetime-default.rs:28:1
|
LL | struct G<'a,'b,T:'a,U:'a+'b>(&'a T, &'b U); //~ ERROR 'a,Ambiguous
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
LL | struct E<'a,'b:'a,T:'b>(&'a T, &'b T); //~ ERROR 'b
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: Ambiguous
--> $DIR/object-lifetime-default.rs:25:1
|
LL | struct D<'a,'b,T:'a+'b>(&'a T, &'b T); //~ ERROR Ambiguous
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: 'a
--> $DIR/object-lifetime-default.rs:22:1
|
LL | struct C<'a,T:'a>(&'a T); //~ ERROR 'a
| ^^^^^^^^^^^^^^^^^^^^^^^^^
error: BaseDefault
--> $DIR/object-lifetime-default.rs:19:1
|
LL | struct B<'a,T>(&'a (), T); //~ ERROR BaseDefault
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
error: BaseDefault
--> $DIR/object-lifetime-default.rs:16:1
|
LL | struct A<T>(T); //~ ERROR BaseDefault
| ^^^^^^^^^^^^^^^
error: aborting due to 7 previous errors

1
src/test/ui/rust-2018/macro-use-warned-against.rs
View file

@ -13,7 +13,6 @@
// compile-pass
#![warn(macro_use_extern_crate, unused)]
#![feature(use_extern_macros)]
#[macro_use] //~ WARN should be replaced at use sites with a `use` statement
extern crate macro_use_warned_against;

4
src/test/ui/rust-2018/macro-use-warned-against.stderr
View file

@ -1,5 +1,5 @@
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:18:1
--> $DIR/macro-use-warned-against.rs:17:1
|
LL | #[macro_use] //~ WARN should be replaced at use sites with a `use` statement
| ^^^^^^^^^^^^
@ -11,7 +11,7 @@ LL | #![warn(macro_use_extern_crate, unused)]
| ^^^^^^^^^^^^^^^^^^^^^^
warning: unused `#[macro_use]` import
--> $DIR/macro-use-warned-against.rs:20:1
--> $DIR/macro-use-warned-against.rs:19:1
|
LL | #[macro_use] //~ WARN unused `#[macro_use]`
| ^^^^^^^^^^^^

15
src/test/ui/tool-attributes/tool-attributes-disabled-1.rs
View file

@ -1,15 +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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// If macro modularization (`use_extern_macros`) is not enabled,
// then tool attributes are treated as custom attributes.
#[rustfmt::bar] //~ ERROR The attribute `rustfmt::bar` is currently unknown to the compiler
fn main() {}

11
src/test/ui/tool-attributes/tool-attributes-disabled-1.stderr
View file

@ -1,11 +0,0 @@
error[E0658]: The attribute `rustfmt::bar` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642)
--> $DIR/tool-attributes-disabled-1.rs:14:1
|
LL | #[rustfmt::bar] //~ ERROR The attribute `rustfmt::bar` is currently unknown to the compiler
| ^^^^^^^^^^^^^^^
|
= help: add #![feature(custom_attribute)] to the crate attributes to enable
error: aborting due to previous error
For more information about this error, try `rustc --explain E0658`.

15
src/test/ui/tool-attributes/tool-attributes-disabled-2.rs
View file

@ -1,15 +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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// If macro modularization (`use_extern_macros`) is not enabled,
// then tool attributes are treated as custom attributes.
#[rustfmt::bar] //~ ERROR attribute `rustfmt::bar` is currently unknown to the compiler
fn main() {}

11
src/test/ui/tool-attributes/tool-attributes-disabled-2.stderr
View file

@ -1,11 +0,0 @@
error[E0658]: The attribute `rustfmt::bar` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642)
--> $DIR/tool-attributes-disabled-2.rs:14:1
|
LL | #[rustfmt::bar] //~ ERROR attribute `rustfmt::bar` is currently unknown to the compiler
| ^^^^^^^^^^^^^^^
|
= help: add #![feature(custom_attribute)] to the crate attributes to enable
error: aborting due to previous error
For more information about this error, try `rustc --explain E0658`.