Skip to content

Commit 4d10bdc

Browse files
committed
std: Move intrinsics to std::intrinsics.
Issue #1457
1 parent edf351e commit 4d10bdc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+49
-47
lines changed

src/libarena/lib.rs

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

4444
// 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/pipe_unix.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::libc;
1515
use std::mem;
1616
use std::rt::rtio;
1717
use std::sync::arc::UnsafeArc;
18-
use std::unstable::intrinsics;
18+
use std::intrinsics;
1919

2020
use super::{IoResult, retry};
2121
use super::file::{keep_going, fd_t};

src/libnative/io/pipe_win32.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ use std::os::win32::as_utf16_p;
9090
use std::ptr;
9191
use std::rt::rtio;
9292
use std::sync::arc::UnsafeArc;
93-
use std::unstable::intrinsics;
93+
use std::intrinsics;
9494

9595
use super::IoResult;
9696

src/librustdoc/html/markdown.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use std::io;
3232
use std::libc;
3333
use std::mem;
3434
use std::str;
35-
use std::unstable::intrinsics;
35+
use std::intrinsics;
3636
use std::vec;
3737

3838
/// 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
@@ -196,7 +196,8 @@ pub mod reflect;
196196
// Private APIs
197197
#[unstable]
198198
pub mod unstable;
199-
199+
#[experimental]
200+
pub mod intrinsics;
200201

201202
/* For internal use, not exported */
202203

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

0 commit comments

Comments
 (0)