Migrated remaining src/test/run-pass/ subdirectories to src/test/ui/run-pass/.
This commit is contained in:
Felix S. Klock II
parent
20ca02569a
commit
76ceeddb2b
171 changed files with 0 additions and 0 deletions
|
|
@ -1,59 +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.
|
||||
|
||||
// edition:2018
|
||||
|
||||
#![feature(decl_macro, uniform_paths)]
|
||||
|
||||
// This test is similar to `basic.rs`, but nested in modules.
|
||||
|
||||
mod foo {
|
||||
// Test that ambiguity errors are not emitted between `self::test` and
|
||||
// `::test`, assuming the latter (crate) is not in `extern_prelude`.
|
||||
mod test {
|
||||
pub struct Foo(pub ());
|
||||
}
|
||||
pub use test::Foo;
|
||||
|
||||
// Test that qualified paths can refer to both the external crate and local item.
|
||||
mod std {
|
||||
pub struct io(pub ());
|
||||
}
|
||||
pub use ::std::io as std_io;
|
||||
pub use self::std::io as local_io;
|
||||
}
|
||||
|
||||
// Test that we can refer to the external crate unqualified
|
||||
// (when there isn't a local item with the same name).
|
||||
use std::io;
|
||||
|
||||
mod bar {
|
||||
// Also test the unqualified external crate import in a nested module,
|
||||
// to show that the above import doesn't resolve through a local `std`
|
||||
// item, e.g. the automatically injected `extern crate std;`, which in
|
||||
// the Rust 2018 should no longer be visible through `crate::std`.
|
||||
pub use std::io;
|
||||
|
||||
// Also test that items named `std` in other namespaces don't
|
||||
// cause ambiguity errors for the import from `std` above.
|
||||
pub fn std() {}
|
||||
pub macro std() {}
|
||||
}
|
||||
|
||||
|
||||
fn main() {
|
||||
foo::Foo(());
|
||||
foo::std_io::stdout();
|
||||
foo::local_io(());
|
||||
io::stdout();
|
||||
bar::io::stdout();
|
||||
bar::std();
|
||||
bar::std!();
|
||||
}
|
||||
|
|
@ -1,33 +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.
|
||||
|
||||
// edition:2018
|
||||
|
||||
#![feature(uniform_paths)]
|
||||
|
||||
// Test that ambiguity errors are not emitted between `self::test` and
|
||||
// `::test`, assuming the latter (crate) is not in `extern_prelude`.
|
||||
mod test {
|
||||
pub struct Foo(pub ());
|
||||
}
|
||||
use test::Foo;
|
||||
|
||||
// Test that qualified paths can refer to both the external crate and local item.
|
||||
mod std {
|
||||
pub struct io(pub ());
|
||||
}
|
||||
use ::std::io as std_io;
|
||||
use self::std::io as local_io;
|
||||
|
||||
fn main() {
|
||||
Foo(());
|
||||
std_io::stdout();
|
||||
local_io(());
|
||||
}
|
||||
|
|
@ -1,62 +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.
|
||||
|
||||
// edition:2018
|
||||
|
||||
#![feature(uniform_paths)]
|
||||
|
||||
// This test is similar to `macros.rs`, but nested in modules.
|
||||
|
||||
mod foo {
|
||||
// Test that ambiguity errors are not emitted between `self::test` and
|
||||
// `::test`, assuming the latter (crate) is not in `extern_prelude`.
|
||||
macro_rules! m1 {
|
||||
() => {
|
||||
mod test {
|
||||
pub struct Foo(pub ());
|
||||
}
|
||||
}
|
||||
}
|
||||
pub use test::Foo;
|
||||
m1!();
|
||||
|
||||
// Test that qualified paths can refer to both the external crate and local item.
|
||||
macro_rules! m2 {
|
||||
() => {
|
||||
mod std {
|
||||
pub struct io(pub ());
|
||||
}
|
||||
}
|
||||
}
|
||||
pub use ::std::io as std_io;
|
||||
pub use self::std::io as local_io;
|
||||
m2!();
|
||||
}
|
||||
|
||||
// Test that we can refer to the external crate unqualified
|
||||
// (when there isn't a local item with the same name).
|
||||
use std::io;
|
||||
|
||||
mod bar {
|
||||
// Also test the unqualified external crate import in a nested module,
|
||||
// to show that the above import doesn't resolve through a local `std`
|
||||
// item, e.g. the automatically injected `extern crate std;`, which in
|
||||
// the Rust 2018 should no longer be visible through `crate::std`.
|
||||
pub use std::io;
|
||||
}
|
||||
|
||||
|
||||
fn main() {
|
||||
foo::Foo(());
|
||||
foo::std_io::stdout();
|
||||
foo::local_io(());
|
||||
io::stdout();
|
||||
bar::io::stdout();
|
||||
}
|
||||
|
|
@ -1,45 +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.
|
||||
|
||||
// edition:2018
|
||||
|
||||
#![feature(uniform_paths)]
|
||||
|
||||
// This test is similar to `basic.rs`, but with macros defining local items.
|
||||
|
||||
// Test that ambiguity errors are not emitted between `self::test` and
|
||||
// `::test`, assuming the latter (crate) is not in `extern_prelude`.
|
||||
macro_rules! m1 {
|
||||
() => {
|
||||
mod test {
|
||||
pub struct Foo(pub ());
|
||||
}
|
||||
}
|
||||
}
|
||||
use test::Foo;
|
||||
m1!();
|
||||
|
||||
// Test that qualified paths can refer to both the external crate and local item.
|
||||
macro_rules! m2 {
|
||||
() => {
|
||||
mod std {
|
||||
pub struct io(pub ());
|
||||
}
|
||||
}
|
||||
}
|
||||
use ::std::io as std_io;
|
||||
use self::std::io as local_io;
|
||||
m2!();
|
||||
|
||||
fn main() {
|
||||
Foo(());
|
||||
std_io::stdout();
|
||||
local_io(());
|
||||
}
|
||||
|
|
@ -1,109 +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.
|
||||
|
||||
// edition:2018
|
||||
|
||||
#![feature(uniform_paths)]
|
||||
|
||||
pub const A: usize = 0;
|
||||
|
||||
pub mod foo {
|
||||
pub const B: usize = 1;
|
||||
|
||||
pub mod bar {
|
||||
pub const C: usize = 2;
|
||||
|
||||
pub enum E {
|
||||
V1(usize),
|
||||
V2(String),
|
||||
}
|
||||
|
||||
pub fn test() -> String {
|
||||
format!("{} {} {}", crate::A, crate::foo::B, C)
|
||||
}
|
||||
|
||||
pub fn test_use() -> String {
|
||||
use crate::A;
|
||||
use crate::foo::B;
|
||||
|
||||
format!("{} {} {}", A, B, C)
|
||||
}
|
||||
|
||||
pub fn test_enum() -> String {
|
||||
use E::*;
|
||||
match E::V1(10) {
|
||||
V1(i) => { format!("V1: {}", i) }
|
||||
V2(s) => { format!("V2: {}", s) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn test() -> String {
|
||||
format!("{} {} {}", crate::A, B, bar::C)
|
||||
}
|
||||
|
||||
pub fn test_use() -> String {
|
||||
use crate::A;
|
||||
use bar::C;
|
||||
|
||||
format!("{} {} {}", A, B, C)
|
||||
}
|
||||
|
||||
pub fn test_enum() -> String {
|
||||
use bar::E::*;
|
||||
match bar::E::V1(10) {
|
||||
V1(i) => { format!("V1: {}", i) }
|
||||
V2(s) => { format!("V2: {}", s) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn test() -> String {
|
||||
format!("{} {} {}", A, foo::B, foo::bar::C)
|
||||
}
|
||||
|
||||
pub fn test_use() -> String {
|
||||
use foo::B;
|
||||
use foo::bar::C;
|
||||
|
||||
format!("{} {} {}", A, B, C)
|
||||
}
|
||||
|
||||
pub fn test_enum() -> String {
|
||||
use foo::bar::E::*;
|
||||
match foo::bar::E::V1(10) {
|
||||
V1(i) => { format!("V1: {}", i) }
|
||||
V2(s) => { format!("V2: {}", s) }
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let output = [
|
||||
test(),
|
||||
foo::test(),
|
||||
foo::bar::test(),
|
||||
test_use(),
|
||||
foo::test_use(),
|
||||
foo::bar::test_use(),
|
||||
test_enum(),
|
||||
foo::test_enum(),
|
||||
foo::bar::test_enum(),
|
||||
].join("\n");
|
||||
assert_eq!(output, "\
|
||||
0 1 2
|
||||
0 1 2
|
||||
0 1 2
|
||||
0 1 2
|
||||
0 1 2
|
||||
0 1 2
|
||||
V1: 10
|
||||
V1: 10
|
||||
V1: 10");
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue