about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorCharles Lew <crlf0710@gmail.com>2021-04-24 13:16:34 +0800
committerCharles Lew <crlf0710@gmail.com>2021-05-09 10:52:03 +0800
commit89a67051a76f8511372d7b9f14610474b1dba6aa (patch)
tree275bbf42c8ef07c9d86bfb8a159dec246798c588 /src
parent49920bc581743d6edb9f82fbff4cbafebc212619 (diff)
downloadrust-89a67051a76f8511372d7b9f14610474b1dba6aa.tar.gz
rust-89a67051a76f8511372d7b9f14610474b1dba6aa.zip
Add primary marker on codegen unit to take charge of main_wrapper for non-local cases.
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/entry-point/imported_main_from_extern_crate.rs6
-rw-r--r--src/test/ui/entry-point/imported_main_from_extern_crate.stderr10
2 files changed, 2 insertions, 14 deletions
diff --git a/src/test/ui/entry-point/imported_main_from_extern_crate.rs b/src/test/ui/entry-point/imported_main_from_extern_crate.rs
index 6bbf67fa540..4fddfc44ac6 100644
--- a/src/test/ui/entry-point/imported_main_from_extern_crate.rs
+++ b/src/test/ui/entry-point/imported_main_from_extern_crate.rs
@@ -1,9 +1,7 @@
-// build-fail
+// run-pass
 // aux-build:main_functions.rs
 
 #![feature(imported_main)]
 
 extern crate main_functions;
-pub use main_functions::boilerplate as main; //~ ERROR entry symbol `main` from foreign crate
-
-// FIXME: Should be run-pass
+pub use main_functions::boilerplate as main;
diff --git a/src/test/ui/entry-point/imported_main_from_extern_crate.stderr b/src/test/ui/entry-point/imported_main_from_extern_crate.stderr
deleted file mode 100644
index 8792e1e4142..00000000000
--- a/src/test/ui/entry-point/imported_main_from_extern_crate.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: entry symbol `main` from foreign crate is not yet supported.
-  --> $DIR/imported_main_from_extern_crate.rs:7:9
-   |
-LL | pub use main_functions::boilerplate as main;
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: see issue #28937 <https://github.com/rust-lang/rust/issues/28937> for more information
-
-error: aborting due to previous error
-