about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@posteo>2017-11-06 10:35:52 +0100
committerMichael Woerister <michaelwoerister@posteo>2017-11-07 08:54:38 +0100
commit8fcf3e33e4f27fa56ac3c9dee150f6eb4a91f213 (patch)
tree1a28b8691abc5cb359d4de5f1d3145d2276582c2
parente546fea0a187dfeeddb7a3a17486aabd686c0555 (diff)
downloadrust-8fcf3e33e4f27fa56ac3c9dee150f6eb4a91f213.tar.gz
rust-8fcf3e33e4f27fa56ac3c9dee150f6eb4a91f213.zip
Fix some rebasing fallout.
-rw-r--r--src/test/mir-opt/issue-41110.rs5
-rw-r--r--src/test/mir-opt/match_false_edges.rs8
2 files changed, 8 insertions, 5 deletions
diff --git a/src/test/mir-opt/issue-41110.rs b/src/test/mir-opt/issue-41110.rs
index de789e07d9f..bfac6c739a3 100644
--- a/src/test/mir-opt/issue-41110.rs
+++ b/src/test/mir-opt/issue-41110.rs
@@ -14,10 +14,9 @@ fn main() {
     let x = S.other(S.id());
 }
 
-// no_mangle and extern C to make sure this gets instantiated even in an
-// executable.
+// no_mangle to make sure this gets instantiated even in an executable.
 #[no_mangle]
-pub extern "C" fn test() {
+pub fn test() {
     let u = S;
     let mut v = S;
     drop(v);
diff --git a/src/test/mir-opt/match_false_edges.rs b/src/test/mir-opt/match_false_edges.rs
index 78214dab539..56c5dd3be47 100644
--- a/src/test/mir-opt/match_false_edges.rs
+++ b/src/test/mir-opt/match_false_edges.rs
@@ -18,7 +18,9 @@ fn guard2(_:i32) -> bool {
     true
 }
 
-fn full_tested_match() {
+// no_mangle to make sure this gets instantiated even in an executable.
+#[no_mangle]
+pub fn full_tested_match() {
     let _ = match Some(42) {
         Some(x) if guard() => (1, x),
         Some(y) => (2, y),
@@ -26,7 +28,9 @@ fn full_tested_match() {
     };
 }
 
-fn full_tested_match2() {
+// no_mangle to make sure this gets instantiated even in an executable.
+#[no_mangle]
+pub fn full_tested_match2() {
     let _ = match Some(42) {
         Some(x) if guard() => (1, x),
         None => (3, 3),