Skip to content

Commit 598f01d

Browse files
committed
std: Move intrinsics to std::intrinsics.
Issue rust-lang#1457
1 parent f3d4fe7 commit 598f01d

40 files changed

+48
-46
lines changed

src/libarena/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ use std::num;
3636
use std::kinds::marker;
3737
use std::rc::Rc;
3838
use std::rt::global_heap;
39-
use std::unstable::intrinsics::{TyDesc, get_tydesc};
40-
use std::unstable::intrinsics;
39+
use std::intrinsics::{TyDesc, get_tydesc};
40+
use std::intrinsics;
4141
use std::vec;
4242

4343
// The way arena uses arrays is really deeply awful. The arrays are

src/libgreen/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ memory and partly incapable of presentation to others.",
124124
abort();
125125

126126
fn abort() -> ! {
127-
use std::unstable::intrinsics;
127+
use std::intrinsics;
128128
unsafe { intrinsics::abort() }
129129
}
130130
}

src/libnative/io/process.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ fn spawn_process_os(prog: &str, args: &[~str],
372372
use std::libc::funcs::posix88::unistd::{fork, dup2, close, chdir, execvp};
373373
use std::libc::funcs::bsd44::getdtablesize;
374374
use std::libc::c_ulong;
375-
use std::unstable::intrinsics;
375+
use std::intrinsics;
376376

377377
mod rustrt {
378378
extern {

src/librustdoc/html/markdown.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use std::io;
3030
use std::libc;
3131
use std::mem;
3232
use std::str;
33-
use std::unstable::intrinsics;
33+
use std::intrinsics;
3434
use std::vec;
3535

3636
/// A unit struct which has the `fmt::Show` trait implemented. When

src/libstd/any.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ use fmt;
2525
use option::{Option, Some, None};
2626
use result::{Result, Ok, Err};
2727
use to_str::ToStr;
28-
use unstable::intrinsics::TypeId;
29-
use unstable::intrinsics;
28+
use intrinsics::TypeId;
29+
use intrinsics;
3030

3131
/// A type with no inhabitants
3232
pub enum Void { }

src/libstd/cast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//! Unsafe casting functions
1212
1313
use mem;
14-
use unstable::intrinsics;
14+
use intrinsics;
1515
use ptr::copy_nonoverlapping_memory;
1616

1717
/// Casts the value at `src` to U. The two types must have the same length.

src/libstd/unstable/intrinsics.rs renamed to src/libstd/intrinsics.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ A quick refresher on memory ordering:
4141
4242
*/
4343

44+
#[allow(missing_doc)];
45+
4446
// This is needed to prevent duplicate lang item definitions.
4547
#[cfg(test)]
46-
pub use realstd::unstable::intrinsics::{TyDesc, Opaque, TyVisitor, TypeId};
48+
pub use realstd::intrinsics::{TyDesc, Opaque, TyVisitor, TypeId};
4749

4850
pub type GlueFn = extern "Rust" fn(*i8);
4951

src/libstd/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,8 @@ pub mod reflect;
191191
// Private APIs
192192
#[unstable]
193193
pub mod unstable;
194-
194+
#[experimental]
195+
pub mod intrinsics;
195196

196197
/* For internal use, not exported */
197198

src/libstd/local_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ fn get_with<T:'static,
281281
}
282282

283283
fn abort() -> ! {
284-
use std::unstable::intrinsics;
284+
use intrinsics;
285285
unsafe { intrinsics::abort() }
286286
}
287287

src/libstd/mem.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
use cast;
1919
use ptr;
20-
use unstable::intrinsics;
21-
use unstable::intrinsics::{bswap16, bswap32, bswap64};
20+
use intrinsics;
21+
use intrinsics::{bswap16, bswap32, bswap64};
2222

2323
/// Returns the size of a type
2424
#[inline]

src/libstd/num/f32.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use num::{FPCategory, FPNaN, FPInfinite , FPZero, FPSubnormal, FPNormal};
2020
use num::{Zero, One, Bounded, strconv};
2121
use num;
2222
use to_str;
23-
use unstable::intrinsics;
23+
use intrinsics;
2424

2525
macro_rules! delegate(
2626
(

src/libstd/num/f64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use num::{FPCategory, FPNaN, FPInfinite , FPZero, FPSubnormal, FPNormal};
2121
use num::{Zero, One, Bounded, strconv};
2222
use num;
2323
use to_str;
24-
use unstable::intrinsics;
24+
use intrinsics;
2525

2626
pub use cmp::{min, max};
2727

src/libstd/num/i16.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2020
use num::{ToStrRadix, FromStrRadix};
2121
use option::{Option, Some, None};
2222
use str;
23-
use unstable::intrinsics;
23+
use intrinsics;
2424

2525
int_module!(i16, 16)
2626

src/libstd/num/i32.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2020
use num::{ToStrRadix, FromStrRadix};
2121
use option::{Option, Some, None};
2222
use str;
23-
use unstable::intrinsics;
23+
use intrinsics;
2424

2525
int_module!(i32, 32)
2626

src/libstd/num/i64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2222
use num::{ToStrRadix, FromStrRadix};
2323
use option::{Option, Some, None};
2424
use str;
25-
use unstable::intrinsics;
25+
use intrinsics;
2626

2727
int_module!(i64, 64)
2828

src/libstd/num/i8.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2020
use num::{ToStrRadix, FromStrRadix};
2121
use option::{Option, Some, None};
2222
use str;
23-
use unstable::intrinsics;
23+
use intrinsics;
2424

2525
int_module!(i8, 8)
2626

src/libstd/num/int.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2020
use num::{ToStrRadix, FromStrRadix};
2121
use option::{Option, Some, None};
2222
use str;
23-
use unstable::intrinsics;
23+
use intrinsics;
2424

2525
#[cfg(target_word_size = "32")] int_module!(int, 32)
2626
#[cfg(target_word_size = "64")] int_module!(int, 64)

src/libstd/num/u16.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2121
use num::{ToStrRadix, FromStrRadix};
2222
use option::{Option, Some, None};
2323
use str;
24-
use unstable::intrinsics;
24+
use intrinsics;
2525

2626
uint_module!(u16, i16, 16)
2727

src/libstd/num/u32.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2121
use num::{ToStrRadix, FromStrRadix};
2222
use option::{Option, Some, None};
2323
use str;
24-
use unstable::intrinsics;
24+
use intrinsics;
2525

2626
uint_module!(u32, i32, 32)
2727

src/libstd/num/u64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2323
use num::{ToStrRadix, FromStrRadix};
2424
use option::{Option, Some, None};
2525
use str;
26-
use unstable::intrinsics;
26+
use intrinsics;
2727

2828
uint_module!(u64, i64, 64)
2929

src/libstd/num/u8.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2121
use num::{ToStrRadix, FromStrRadix};
2222
use option::{Option, Some, None};
2323
use str;
24-
use unstable::intrinsics;
24+
use intrinsics;
2525

2626
uint_module!(u8, i8, 8)
2727

src/libstd/num/uint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use num::{CheckedDiv, Zero, One, strconv};
2121
use num::{ToStrRadix, FromStrRadix};
2222
use option::{Option, Some, None};
2323
use str;
24-
use unstable::intrinsics;
24+
use intrinsics;
2525

2626
uint_module!(uint, int, ::int::BITS)
2727

src/libstd/ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use cmp::Equiv;
1717
use iter::{range, Iterator};
1818
use mem;
1919
use option::{Option, Some, None};
20-
use unstable::intrinsics;
20+
use intrinsics;
2121

2222
#[cfg(not(test))] use cmp::{Eq, Ord};
2323

src/libstd/reflect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Runtime type reflection
1616

1717
#[allow(missing_doc)];
1818

19-
use unstable::intrinsics::{Disr, Opaque, TyDesc, TyVisitor};
19+
use intrinsics::{Disr, Opaque, TyDesc, TyVisitor};
2020
use mem;
2121
use unstable::raw;
2222

src/libstd/repr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use result::{Ok, Err};
2929
use str::StrSlice;
3030
use to_str::ToStr;
3131
use vec::OwnedVector;
32-
use unstable::intrinsics::{Disr, Opaque, TyDesc, TyVisitor, get_tydesc, visit_tydesc};
32+
use intrinsics::{Disr, Opaque, TyDesc, TyVisitor, get_tydesc, visit_tydesc};
3333
use unstable::raw;
3434

3535
macro_rules! if_ok( ($me:expr, $e:expr) => (

src/libstd/rt/global_heap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
use libc::{c_void, size_t, free, malloc, realloc};
1212
use ptr::{RawPtr, mut_null};
13-
use unstable::intrinsics::abort;
13+
use intrinsics::abort;
1414
use unstable::raw;
1515
use mem::size_of;
1616

src/libstd/rt/unwind.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ use rt::local::Local;
6969
use rt::task::Task;
7070
use str::Str;
7171
use task::TaskResult;
72-
use unstable::intrinsics;
72+
use intrinsics;
7373

7474
use uw = self::libunwind;
7575

src/libstd/rt/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ memory and partly incapable of presentation to others.",
143143
abort();
144144

145145
fn abort() -> ! {
146-
use std::unstable::intrinsics;
146+
use intrinsics;
147147
unsafe { intrinsics::abort() }
148148
}
149149
}

src/libstd/sync/atomics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#[allow(missing_doc)];
2323

24-
use unstable::intrinsics;
24+
use intrinsics;
2525
use cast;
2626
use std::kinds::marker;
2727
use option::{Option,Some,None};

src/libstd/unstable/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use libc::uintptr_t;
1616
pub mod dynamic_lib;
1717

1818
pub mod finally;
19-
pub mod intrinsics;
2019
pub mod simd;
2120
#[cfg(not(test))]
2221
pub mod lang;

src/libstd/unstable/stack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub extern "C" fn rust_stack_exhausted() {
4040
use rt::local::Local;
4141
use rt::task::Task;
4242
use str::Str;
43-
use unstable::intrinsics;
43+
use intrinsics;
4444

4545
unsafe {
4646
// We're calling this function because the stack just ran out. We need

src/test/auxiliary/typeid-intrinsic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::unstable::intrinsics;
12-
use std::unstable::intrinsics::TypeId;
11+
use std::intrinsics;
12+
use std::intrinsics::TypeId;
1313

1414
pub struct A;
1515
pub struct B(Option<A>);

src/test/auxiliary/typeid-intrinsic2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::unstable::intrinsics;
12-
use std::unstable::intrinsics::TypeId;
11+
use std::intrinsics;
12+
use std::intrinsics::TypeId;
1313

1414
pub struct A;
1515
pub struct B(Option<A>);

src/test/bench/sudoku.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use std::io;
1818
use std::io::stdio::StdReader;
1919
use std::io::BufferedReader;
2020
use std::os;
21-
use std::unstable::intrinsics::cttz16;
21+
use std::intrinsics::cttz16;
2222
use std::vec;
2323

2424
// Computes a single solution to a given 9x9 sudoku

src/test/compile-fail/forget-init-unsafe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::unstable::intrinsics::{init, forget};
11+
use std::intrinsics::{init, forget};
1212

1313
// Test that the `forget` and `init` intrinsics are really unsafe
1414
pub fn main() {

src/test/run-make/volatile-intrinsics/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::unstable::intrinsics::{volatile_load, volatile_store};
11+
use std::intrinsics::{volatile_load, volatile_store};
1212

1313
pub fn main() {
1414
unsafe {

src/test/run-pass/issue-6898.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::unstable::intrinsics;
11+
use std::intrinsics;
1212

1313
/// Returns the size of a type
1414
pub fn size_of<T>() -> uint {

src/test/run-pass/reflect-visit-type.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#[feature(managed_boxes)];
1212

13-
use std::unstable::intrinsics::{TyDesc, get_tydesc, visit_tydesc, TyVisitor, Disr, Opaque};
13+
use std::intrinsics::{TyDesc, get_tydesc, visit_tydesc, TyVisitor, Disr, Opaque};
1414

1515
struct MyVisitor {
1616
types: ~[~str],

src/test/run-pass/tydesc-name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// ignore-fast: check-fast screws up repr paths
1212

13-
use std::unstable::intrinsics::get_tydesc;
13+
use std::intrinsics::get_tydesc;
1414

1515
struct Foo<T> {
1616
x: T

src/test/run-pass/typeid-intrinsic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
extern crate other1 = "typeid-intrinsic";
1616
extern crate other2 = "typeid-intrinsic2";
1717

18-
use std::unstable::intrinsics;
19-
use std::unstable::intrinsics::TypeId;
18+
use std::intrinsics;
19+
use std::intrinsics::TypeId;
2020

2121
struct A;
2222
struct Test;

0 commit comments

Comments
 (0)