about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-08-02 08:24:14 +0000
committerbors <bors@rust-lang.org>2018-08-02 08:24:14 +0000
commit02a369a5c8a9be35ddfa17b8af1d51459c4a6bc6 (patch)
tree476ae2ee989e045e1e5a9256960c253d23877769 /src/test
parentdb5476571d9b27c862b95c1e64764b0ac8980e23 (diff)
parent77f9aca2a3e30eb430ba5a506261ff126c2d3077 (diff)
downloadrust-02a369a5c8a9be35ddfa17b8af1d51459c4a6bc6.tar.gz
rust-02a369a5c8a9be35ddfa17b8af1d51459c4a6bc6.zip
Auto merge of #52890 - djrenren:test-visibility, r=petrochenkov
Reexport tests without polluting namespaces

This should fix issue #52557.

Basically now we gensym a new name for the test function and reexport that.
That way the test function's reexport name can't conflict because it was impossible for the test author to write it down.
We then use a `use` statement to expose the original name using the original visibility.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/issue-52557.rs38
1 files changed, 38 insertions, 0 deletions
diff --git a/src/test/run-pass/issue-52557.rs b/src/test/run-pass/issue-52557.rs
new file mode 100644
index 00000000000..2b8dfe162cc
--- /dev/null
+++ b/src/test/run-pass/issue-52557.rs
@@ -0,0 +1,38 @@
+// Copyright 2015 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.
+
+// This test checks for namespace pollution by private tests.
+// Tests used to marked as public causing name conflicts with normal
+// functions only in test builds.
+
+// compile-flags: --test
+
+mod a {
+    pub fn foo() -> bool {
+        true
+    }
+}
+
+mod b {
+    #[test]
+    fn foo() {
+        local_name(); // ensure the local name still works
+    }
+
+    #[test]
+    fn local_name() {}
+}
+
+use a::*;
+use b::*;
+
+pub fn conflict() {
+    let _: bool = foo();
+}