diff options
| author | bors <bors@rust-lang.org> | 2013-03-29 18:39:41 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-29 18:39:41 -0700 |
| commit | fbd8eae26de23cf00081229176fd7efd80943905 (patch) | |
| tree | d95089f050cd67db2a5171a799763faa09f5b0a8 /src/libstd | |
| parent | f864934f548be9f03d2c0512de8d7e908469e2ae (diff) | |
| parent | 6965fe4bceea836586bd8e7aa01a92a35b467f78 (diff) | |
| download | rust-fbd8eae26de23cf00081229176fd7efd80943905.tar.gz rust-fbd8eae26de23cf00081229176fd7efd80943905.zip | |
auto merge of #5631 : brson/rust/abiset, r=brson,brson
Continuing #5421
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/arena.rs | 2 | ||||
| -rw-r--r-- | src/libstd/priority_queue.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs index 683e4a62975..81c28f94d9f 100644 --- a/src/libstd/arena.rs +++ b/src/libstd/arena.rs @@ -48,7 +48,7 @@ use core::vec; pub mod rusti { #[abi = "rust-intrinsic"] - pub extern { + pub extern "rust-intrinsic" { fn move_val_init<T>(dst: &mut T, +src: T); fn needs_drop<T>() -> bool; } diff --git a/src/libstd/priority_queue.rs b/src/libstd/priority_queue.rs index 1fb79fcab28..dd56e413595 100644 --- a/src/libstd/priority_queue.rs +++ b/src/libstd/priority_queue.rs @@ -18,7 +18,7 @@ use core::ptr::addr_of; use core::vec; #[abi = "rust-intrinsic"] -extern "C" mod rusti { +extern "rust-intrinsic" mod rusti { fn move_val_init<T>(dst: &mut T, +src: T); fn init<T>() -> T; } |