Rollup merge of #54072 - blitzerr:master, r=Mark-Simulacrum
Stabilization change for mod.rs This change is in response to https://github.com/rust-lang/rust/issues/53125. The patch makes the feature accepted and removes the tests that tested the non-accepted status of the feature.
This commit is contained in:
kennytm
GitHub
commit
e7b45a0b1f
8 changed files with 3 additions and 185 deletions
|
|
@ -1,15 +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 <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.
|
||||
|
||||
// error-pattern: mod statements in non-mod.rs files are unstable
|
||||
|
||||
mod mod_file_not_owning_aux1;
|
||||
|
||||
fn main() {}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
error[E0658]: mod statements in non-mod.rs files are unstable (see issue #44660)
|
||||
--> $DIR/mod_file_not_owning_aux1.rs:14:17
|
||||
|
|
||||
LL | () => { mod mod_file_not_owning_aux2; }
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
LL | }
|
||||
LL | m!();
|
||||
| ----- in this macro invocation
|
||||
|
|
||||
= help: add #![feature(non_modrs_mods)] to the crate attributes to enable
|
||||
= help: on stable builds, rename this file to mod_file_not_owning_aux1/mod.rs
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
For more information about this error, try `rustc --explain E0658`.
|
||||
|
|
@ -1,15 +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 <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.
|
||||
|
||||
// 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".
|
||||
#[path = "mod_file_not_owning_aux1.rs"]
|
||||
mod foo;
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
error[E0658]: mod statements in non-mod.rs files are unstable (see issue #44660)
|
||||
--> $DIR/mod_file_not_owning_aux1.rs:14:17
|
||||
|
|
||||
LL | () => { mod mod_file_not_owning_aux2; }
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
LL | }
|
||||
LL | m!();
|
||||
| ----- in this macro invocation
|
||||
|
|
||||
= help: add #![feature(non_modrs_mods)] to the crate attributes to enable
|
||||
= help: on stable builds, rename this file to foo/mod.rs
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
For more information about this error, try `rustc --explain E0658`.
|
||||
|
|
@ -1,28 +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 <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.
|
||||
//
|
||||
// Tests the formatting of the feature-gate errors for non_modrs_mods
|
||||
//
|
||||
// gate-test-non_modrs_mods
|
||||
// ignore-windows
|
||||
// ignore-pretty issue #37195
|
||||
pub mod modrs_mod;
|
||||
pub mod foors_mod;
|
||||
|
||||
#[path = "some_crazy_attr_mod_dir/arbitrary_name.rs"]
|
||||
pub mod attr_mod;
|
||||
|
||||
pub fn main() {
|
||||
modrs_mod::inner_modrs_mod::innest::foo();
|
||||
modrs_mod::inner_foors_mod::innest::foo();
|
||||
foors_mod::inner_modrs_mod::innest::foo();
|
||||
foors_mod::inner_foors_mod::innest::foo();
|
||||
attr_mod::inner_modrs_mod::innest::foo();
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
error[E0658]: mod statements in non-mod.rs files are unstable (see issue #44660)
|
||||
--> $DIR/modrs_mod/inner_foors_mod.rs:11:9
|
||||
|
|
||||
LL | pub mod innest;
|
||||
| ^^^^^^
|
||||
|
|
||||
= help: add #![feature(non_modrs_mods)] to the crate attributes to enable
|
||||
= 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
|
||||
|
|
||||
LL | pub mod inner_modrs_mod;
|
||||
| ^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: add #![feature(non_modrs_mods)] to the crate attributes to enable
|
||||
= 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
|
||||
|
|
||||
LL | pub mod inner_foors_mod;
|
||||
| ^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: add #![feature(non_modrs_mods)] to the crate attributes to enable
|
||||
= 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
|
||||
|
|
||||
LL | pub mod innest;
|
||||
| ^^^^^^
|
||||
|
|
||||
= help: add #![feature(non_modrs_mods)] to the crate attributes to enable
|
||||
= help: on stable builds, rename this file to inner_foors_mod/mod.rs
|
||||
|
||||
error: aborting due to 4 previous errors
|
||||
|
||||
For more information about this error, try `rustc --explain E0658`.
|
||||
|
|
@ -1,28 +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 <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.
|
||||
|
||||
// run-pass
|
||||
//
|
||||
// ignore-pretty issue #37195
|
||||
#![feature(non_modrs_mods)]
|
||||
|
||||
pub mod modrs_mod;
|
||||
pub mod foors_mod;
|
||||
|
||||
#[path = "some_crazy_attr_mod_dir/arbitrary_name.rs"]
|
||||
pub mod attr_mod;
|
||||
|
||||
pub fn main() {
|
||||
modrs_mod::inner_modrs_mod::innest::foo();
|
||||
modrs_mod::inner_foors_mod::innest::foo();
|
||||
foors_mod::inner_modrs_mod::innest::foo();
|
||||
foors_mod::inner_foors_mod::innest::foo();
|
||||
attr_mod::inner_modrs_mod::innest::foo();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue