forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#59347 - petrochenkov:nomake, r=davidtwco
Move one test from run-make-fulldeps to ui The test was written when `--extern` without path didn't exist.
- Loading branch information
Showing
10 changed files
with
57 additions
and
50 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...un-make-fulldeps/extern-prelude/ep-vec.rs → src/test/ui/auxiliary/extern-prelude-vec.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
#![crate_type = "rlib"] | ||
#![crate_name = "Vec"] | ||
|
||
pub fn new(arg1: f32, arg2: ()) {} |
2 changes: 0 additions & 2 deletions
2
...un-make-fulldeps/extern-prelude/ep-lib.rs → src/test/ui/auxiliary/extern-prelude.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
#![crate_type = "rlib"] | ||
|
||
pub struct S; | ||
|
||
impl S { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// compile-flags:--extern extern_prelude | ||
// aux-build:extern-prelude.rs | ||
|
||
// Extern prelude names are not available by absolute paths | ||
|
||
fn main() { | ||
use extern_prelude::S; //~ ERROR unresolved import `extern_prelude` | ||
let s = ::extern_prelude::S; //~ ERROR failed to resolve | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
error[E0432]: unresolved import `extern_prelude` | ||
--> $DIR/extern-prelude-fail.rs:7:9 | ||
| | ||
LL | use extern_prelude::S; | ||
| ^^^^^^^^^^^^^^ maybe a missing `extern crate extern_prelude;`? | ||
|
||
error[E0433]: failed to resolve: maybe a missing `extern crate extern_prelude;`? | ||
--> $DIR/extern-prelude-fail.rs:8:15 | ||
| | ||
LL | let s = ::extern_prelude::S; | ||
| ^^^^^^^^^^^^^^ maybe a missing `extern crate extern_prelude;`? | ||
|
||
error: aborting due to 2 previous errors | ||
|
||
Some errors occurred: E0432, E0433. | ||
For more information about an error, try `rustc --explain E0432`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
// compile-pass | ||
// compile-flags:--extern extern_prelude --extern Vec | ||
// aux-build:extern-prelude.rs | ||
// aux-build:extern-prelude-vec.rs | ||
|
||
fn basic() { | ||
// It works | ||
let s = extern_prelude::S; | ||
s.external(); | ||
} | ||
|
||
fn shadow_mod() { | ||
// Local module shadows `extern_prelude` from extern prelude | ||
mod extern_prelude { | ||
pub struct S; | ||
|
||
impl S { | ||
pub fn internal(&self) {} | ||
} | ||
} | ||
|
||
let s = extern_prelude::S; | ||
s.internal(); // OK | ||
} | ||
|
||
fn shadow_prelude() { | ||
// Extern prelude shadows standard library prelude | ||
let x = Vec::new(0f32, ()); // OK | ||
} | ||
|
||
fn main() {} |