librustc: Remove pub extern and priv extern from the language.

Place `pub` or `priv` on individual items instead.
This commit is contained in:
Patrick Walton 2013-07-18 19:08:57 -07:00
parent bb8ca1f52c
commit 06594ed96b
85 changed files with 818 additions and 694 deletions

View file

@ -10,22 +10,22 @@
pub mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
extern "rust-intrinsic" {
pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
pub fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
pub fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
fn atomic_xchg(dst: &mut int, src: int) -> int;
fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
pub fn atomic_xchg(dst: &mut int, src: int) -> int;
pub fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
pub fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
fn atomic_xadd(dst: &mut int, src: int) -> int;
fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
pub fn atomic_xadd(dst: &mut int, src: int) -> int;
pub fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
pub fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
fn atomic_xsub(dst: &mut int, src: int) -> int;
fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
pub fn atomic_xsub(dst: &mut int, src: int) -> int;
pub fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
pub fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
}
}

View file

@ -18,7 +18,7 @@ use std::libc;
pub mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
-> libc::uintptr_t;
}

View file

@ -13,7 +13,7 @@
pub mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_get_argc() -> libc::c_int;
}
}

View file

@ -12,7 +12,7 @@
mod test {
#[abi = "cdecl"]
pub extern {
extern {
pub unsafe fn free();
}
}

View file

@ -13,7 +13,7 @@
#[deny(unused_unsafe)];
mod foo {
pub extern {
extern {
pub fn bar();
}
}

View file

@ -10,7 +10,7 @@
//error-pattern:libc::c_int or libc::c_long should be used
mod xx {
pub extern {
extern {
pub fn strlen(str: *u8) -> uint;
pub fn foo(x: int, y: uint);
}

View file

@ -18,9 +18,9 @@ use std::task;
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
-> libc::uintptr_t;
-> libc::uintptr_t;
}
}

View file

@ -23,7 +23,7 @@ use std::task;
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_get_argc() -> libc::c_int;
}
}

View file

@ -86,7 +86,7 @@ mod test {
#[abi = "cdecl"]
#[nolink]
pub extern {
extern {
pub fn rust_get_sched_id() -> libc::intptr_t;
pub fn get_task_id() -> libc::intptr_t;
}

View file

@ -14,7 +14,7 @@ mod rustrt {
use std::libc;
#[abi = "cdecl"]
pub extern {
extern {
pub fn get_task_id() -> libc::intptr_t;
}
}

View file

@ -13,7 +13,7 @@ use std::str;
mod libc {
#[abi = "cdecl"]
#[nolink]
pub extern {
extern {
pub fn atol(x: *u8) -> int;
pub fn atoll(x: *u8) -> i64;
}

View file

@ -22,14 +22,14 @@ static b: bool = true;
mod rustrt {
#[cfg(bogus)]
#[abi = "cdecl"]
pub extern {
extern {
// This symbol doesn't exist and would be a link error if this
// module was translated
pub fn bogus();
}
#[abi = "cdecl"]
pub extern {}
extern {}
}
#[cfg(bogus)]
@ -110,7 +110,7 @@ fn test_in_fn_ctxt() {
mod test_foreign_items {
pub mod rustrt {
#[abi = "cdecl"]
pub extern {
extern {
#[cfg(bogus)]
pub fn rust_get_stdin() -> ~str;
pub fn rust_get_stdin() -> ~str;

View file

@ -13,7 +13,7 @@ use std::libc;
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
-> libc::uintptr_t;
}

View file

@ -14,7 +14,7 @@ use std::task;
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
-> libc::uintptr_t;
}

View file

@ -18,7 +18,7 @@ use std::task;
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
-> libc::uintptr_t;
}

View file

@ -13,7 +13,7 @@ use std::libc;
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
-> libc::uintptr_t;
}

View file

@ -18,7 +18,7 @@ struct TwoU16s {
one: u16, two: u16
}
pub extern {
extern {
pub fn rust_dbg_extern_identity_TwoU16s(v: TwoU16s) -> TwoU16s;
}

View file

@ -16,7 +16,7 @@ struct TwoU32s {
one: u32, two: u32
}
pub extern {
extern {
pub fn rust_dbg_extern_identity_TwoU32s(v: TwoU32s) -> TwoU32s;
}

View file

@ -15,7 +15,7 @@ struct TwoU64s {
one: u64, two: u64
}
pub extern {
extern {
pub fn rust_dbg_extern_identity_TwoU64s(u: TwoU64s) -> TwoU64s;
}

View file

@ -20,7 +20,7 @@ struct TwoU64s {
one: u64, two: u64
}
pub extern {
extern {
pub fn rust_dbg_extern_identity_TwoU64s(v: TwoU64s) -> TwoU64s;
}

View file

@ -18,7 +18,7 @@ struct TwoU8s {
one: u8, two: u8
}
pub extern {
extern {
pub fn rust_dbg_extern_identity_TwoU8s(v: TwoU8s) -> TwoU8s;
}

View file

@ -10,7 +10,7 @@
// Test a function that takes/returns a u8.
pub extern {
extern {
pub fn rust_dbg_extern_identity_u8(v: u8) -> u8;
}

View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
pub extern {
extern {
pub fn rust_dbg_extern_identity_double(v: f64) -> f64;
}

View file

@ -10,7 +10,7 @@
// Test a function that takes/returns a u32.
pub extern {
extern {
pub fn rust_dbg_extern_identity_u32(v: u32) -> u32;
}

View file

@ -10,7 +10,7 @@
// Test a call to a function that takes/returns a u64.
pub extern {
extern {
pub fn rust_dbg_extern_identity_u64(v: u64) -> u64;
}

View file

@ -15,7 +15,7 @@ struct TwoU16s {
one: u16, two: u16
}
pub extern {
extern {
pub fn rust_dbg_extern_return_TwoU16s() -> TwoU16s;
}

View file

@ -12,7 +12,7 @@ struct TwoU32s {
one: u32, two: u32
}
pub extern {
extern {
pub fn rust_dbg_extern_return_TwoU32s() -> TwoU32s;
}

View file

@ -12,7 +12,7 @@ struct TwoU64s {
one: u64, two: u64
}
pub extern {
extern {
pub fn rust_dbg_extern_return_TwoU64s() -> TwoU64s;
}

View file

@ -15,7 +15,7 @@ struct TwoU8s {
one: u8, two: u8
}
pub extern {
extern {
pub fn rust_dbg_extern_return_TwoU8s() -> TwoU8s;
}

View file

@ -17,7 +17,7 @@ use std::task;
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
-> libc::uintptr_t;
}

View file

@ -14,7 +14,7 @@ use std::task;
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
-> libc::uintptr_t;
}

View file

@ -16,7 +16,7 @@ mod rustrt1 {
#[abi = "cdecl"]
#[link_name = "rustrt"]
pub extern {
extern {
pub fn rust_get_argc() -> libc::c_int;
}
}
@ -26,7 +26,7 @@ mod rustrt2 {
#[abi = "cdecl"]
#[link_name = "rustrt"]
pub extern {
extern {
pub fn rust_get_argc() -> libc::c_int;
}
}

View file

@ -17,7 +17,7 @@ use std::vec;
mod libc {
#[nolink]
#[abi = "cdecl"]
pub extern {
extern {
#[link_name = "strlen"]
pub fn my_strlen(str: *u8) -> uint;
}

View file

@ -16,7 +16,7 @@ mod WHATGOESHERE {
// FIXME: I want to name a mod that would not link successfully
// wouthout providing a -L argument to the compiler, and that
// will also be found successfully at runtime.
pub extern {
extern {
pub fn IDONTKNOW() -> u32;
}
}

View file

@ -10,7 +10,7 @@
mod foo {
#[nolink]
pub extern {
extern {
pub static errno: int;
}
}

View file

@ -13,7 +13,7 @@
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn get_task_id() -> libc::intptr_t;
}
}

View file

@ -17,7 +17,7 @@ mod bindgen {
use super::void;
#[nolink]
pub extern {
extern {
pub fn printf(v: void);
}
}

View file

@ -11,28 +11,28 @@
mod bar {
#[abi = "cdecl"]
#[nolink]
pub extern {}
extern {}
}
mod zed {
#[abi = "cdecl"]
#[nolink]
pub extern {}
extern {}
}
mod libc {
#[abi = "cdecl"]
#[nolink]
pub extern {
extern {
pub fn write(fd: int, buf: *u8, count: ::std::libc::size_t)
-> ::std::libc::ssize_t;
-> ::std::libc::ssize_t;
}
}
mod baz {
#[abi = "cdecl"]
#[nolink]
pub extern {}
extern {}
}
pub fn main() { }

View file

@ -12,7 +12,7 @@
mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
extern "rust-intrinsic" {
pub fn pref_align_of<T>() -> uint;
pub fn min_align_of<T>() -> uint;
}

View file

@ -10,7 +10,7 @@
mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
extern "rust-intrinsic" {
pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
pub fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
pub fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;

View file

@ -12,7 +12,7 @@
mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
extern "rust-intrinsic" {
pub fn frame_address(f: &once fn(*u8));
}
}

View file

@ -10,7 +10,7 @@
mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
extern "rust-intrinsic" {
pub fn move_val_init<T>(dst: &mut T, src: T);
pub fn move_val<T>(dst: &mut T, src: T);
}

View file

@ -10,7 +10,7 @@
mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
extern "rust-intrinsic" {
fn uninit<T>() -> T;
}
}

View file

@ -14,7 +14,7 @@ extern mod extra;
mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
extern "rust-intrinsic" {
fn ctpop8(x: i8) -> i8;
fn ctpop16(x: i16) -> i16;
fn ctpop32(x: i32) -> i32;

View file

@ -14,37 +14,37 @@ use std::f64;
mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
fn sqrtf32(x: f32) -> f32;
fn sqrtf64(x: f64) -> f64;
fn powif32(a: f32, x: i32) -> f32;
fn powif64(a: f64, x: i32) -> f64;
fn sinf32(x: f32) -> f32;
fn sinf64(x: f64) -> f64;
fn cosf32(x: f32) -> f32;
fn cosf64(x: f64) -> f64;
fn powf32(a: f32, x: f32) -> f32;
fn powf64(a: f64, x: f64) -> f64;
fn expf32(x: f32) -> f32;
fn expf64(x: f64) -> f64;
fn exp2f32(x: f32) -> f32;
fn exp2f64(x: f64) -> f64;
fn logf32(x: f32) -> f32;
fn logf64(x: f64) -> f64;
fn log10f32(x: f32) -> f32;
fn log10f64(x: f64) -> f64;
fn log2f32(x: f32) -> f32;
fn log2f64(x: f64) -> f64;
fn fmaf32(a: f32, b: f32, c: f32) -> f32;
fn fmaf64(a: f64, b: f64, c: f64) -> f64;
fn fabsf32(x: f32) -> f32;
fn fabsf64(x: f64) -> f64;
fn floorf32(x: f32) -> f32;
fn floorf64(x: f64) -> f64;
fn ceilf32(x: f32) -> f32;
fn ceilf64(x: f64) -> f64;
fn truncf32(x: f32) -> f32;
fn truncf64(x: f64) -> f64;
extern "rust-intrinsic" {
pub fn sqrtf32(x: f32) -> f32;
pub fn sqrtf64(x: f64) -> f64;
pub fn powif32(a: f32, x: i32) -> f32;
pub fn powif64(a: f64, x: i32) -> f64;
pub fn sinf32(x: f32) -> f32;
pub fn sinf64(x: f64) -> f64;
pub fn cosf32(x: f32) -> f32;
pub fn cosf64(x: f64) -> f64;
pub fn powf32(a: f32, x: f32) -> f32;
pub fn powf64(a: f64, x: f64) -> f64;
pub fn expf32(x: f32) -> f32;
pub fn expf64(x: f64) -> f64;
pub fn exp2f32(x: f32) -> f32;
pub fn exp2f64(x: f64) -> f64;
pub fn logf32(x: f32) -> f32;
pub fn logf64(x: f64) -> f64;
pub fn log10f32(x: f32) -> f32;
pub fn log10f64(x: f64) -> f64;
pub fn log2f32(x: f32) -> f32;
pub fn log2f64(x: f64) -> f64;
pub fn fmaf32(a: f32, b: f32, c: f32) -> f32;
pub fn fmaf64(a: f64, b: f64, c: f64) -> f64;
pub fn fabsf32(x: f32) -> f32;
pub fn fabsf64(x: f64) -> f64;
pub fn floorf32(x: f32) -> f32;
pub fn floorf64(x: f64) -> f64;
pub fn ceilf32(x: f32) -> f32;
pub fn ceilf64(x: f64) -> f64;
pub fn truncf32(x: f32) -> f32;
pub fn truncf64(x: f64) -> f64;
}
}

View file

@ -13,7 +13,7 @@
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn get_task_id() -> libc::intptr_t;
}
}

View file

@ -13,7 +13,7 @@ mod a {
pub type rust_task = uint;
pub mod rustrt {
use super::rust_task;
pub extern {
extern {
pub fn rust_task_is_unwinding(rt: *rust_task) -> bool;
}
}
@ -23,7 +23,7 @@ mod b {
pub type rust_task = bool;
pub mod rustrt {
use super::rust_task;
pub extern {
extern {
pub fn rust_task_is_unwinding(rt: *rust_task) -> bool;
}
}

View file

@ -31,7 +31,7 @@ mod m {
#[link_name = "m"]
#[abi = "cdecl"]
pub extern {
extern {
#[cfg(unix)]
#[link_name="lgamma_r"]
pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;

View file

@ -40,7 +40,7 @@ mod test_single_attr_outer {
pub mod rustrt {
#[attr = "val"]
#[abi = "cdecl"]
pub extern {}
extern {}
}
}
@ -61,7 +61,7 @@ mod test_multi_attr_outer {
#[attr1 = "val"]
#[attr2 = "val"]
#[abi = "cdecl"]
pub extern {}
extern {}
}
#[attr1 = "val"]
@ -84,7 +84,7 @@ mod test_stmt_single_attr_outer {
mod rustrt {
#[attr = "val"]
#[abi = "cdecl"]
pub extern {
extern {
}
}
}
@ -111,7 +111,7 @@ mod test_stmt_multi_attr_outer {
#[attr1 = "val"]
#[attr2 = "val"]
#[abi = "cdecl"]
pub extern {
extern {
}
}
*/
@ -170,7 +170,7 @@ mod test_foreign_items {
use std::libc;
#[abi = "cdecl"]
pub extern {
extern {
#[attr];
#[attr]

View file

@ -11,7 +11,7 @@
mod rusti {
#[nolink]
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
extern "rust-intrinsic" {
pub fn morestack_addr() -> *();
}
}

View file

@ -17,7 +17,7 @@ use std::task;
mod rustrt {
use std::libc;
pub extern {
extern {
pub fn debug_get_stk_seg() -> *u8;
pub fn rust_get_sched_id() -> libc::intptr_t;

View file

@ -11,7 +11,7 @@
// Issue #901
mod libc {
#[nolink]
pub extern {
extern {
pub fn printf(x: ());
}
}

View file

@ -14,7 +14,7 @@ use std::sys;
mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
extern "rust-intrinsic" {
pub fn pref_align_of<T>() -> uint;
pub fn min_align_of<T>() -> uint;
}

View file

@ -14,7 +14,7 @@ use std::sys;
mod rusti {
#[abi = "rust-intrinsic"]
pub extern "rust-intrinsic" {
extern "rust-intrinsic" {
pub fn pref_align_of<T>() -> uint;
pub fn min_align_of<T>() -> uint;
}

View file

@ -25,7 +25,7 @@ mod rustrt {
use std::libc;
pub extern {
extern {
pub fn rust_new_sched(num_threads: libc::uintptr_t) -> sched_id;
pub fn rust_get_sched_id() -> sched_id;
pub fn rust_new_task_in_sched(id: sched_id) -> task_id;

View file

@ -15,7 +15,7 @@ mod rustrt {
use super::{Floats, Quad};
#[nolink]
pub extern {
extern {
pub fn debug_abi_1(q: Quad) -> Quad;
pub fn debug_abi_2(f: Floats) -> Floats;
}

View file

@ -14,7 +14,7 @@
mod libc {
#[nolink]
pub extern {
extern {
pub fn malloc(size: int) -> *u8;
}
}

View file

@ -19,7 +19,7 @@ mod kernel32 {
#[cfg(target_os = "win32")]
#[abi = "stdcall"]
pub extern "stdcall" {
extern "stdcall" {
pub fn GetProcessHeap() -> HANDLE;
pub fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T)
-> LPVOID;