about summary refs log tree commit diff
path: root/src/test/run-pass/static-function-pointer.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-23 19:26:53 -0800
committerbors <bors@rust-lang.org>2014-02-23 19:26:53 -0800
commit3c2650b4d570bee29332e75109687bc3d5d05b5c (patch)
tree0132d5e538deebea43c06962c904e3013a862c8c /src/test/run-pass/static-function-pointer.rs
parent7cc6b5e0a3a2038d66301906f76cdb778304a3bd (diff)
parent317a253b22a512fad46c3749ea86d9674ff18453 (diff)
downloadrust-3c2650b4d570bee29332e75109687bc3d5d05b5c.tar.gz
rust-3c2650b4d570bee29332e75109687bc3d5d05b5c.zip
auto merge of #12328 : nick29581/rust/abi, r=alexcrichton
Diffstat (limited to 'src/test/run-pass/static-function-pointer.rs')
-rw-r--r--src/test/run-pass/static-function-pointer.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-pass/static-function-pointer.rs b/src/test/run-pass/static-function-pointer.rs
index f8a889113ac..ff1091e07ef 100644
--- a/src/test/run-pass/static-function-pointer.rs
+++ b/src/test/run-pass/static-function-pointer.rs
@@ -11,8 +11,8 @@
 fn f(x: int) -> int { x }
 fn g(x: int) -> int { 2 * x }
 
-static F: extern fn(int) -> int = f;
-static mut G: extern fn(int) -> int = f;
+static F: fn(int) -> int = f;
+static mut G: fn(int) -> int = f;
 
 pub fn main() {
     assert_eq!(F(42), 42);