Skip to content

Commit b55945c

Browse files
committed
---
yaml --- r: 151377 b: refs/heads/try2 c: dca8a0d h: refs/heads/master i: 151375: 49ce33f v: v3
1 parent f2ee7c2 commit b55945c

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 5b75e44fb01f0eda10ce8d8df92b80945d894768
8+
refs/heads/try2: dca8a0d6e4d1848ead898b3fa5b1e6c940c85b87
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@
2424
/* Core modules for ownership management */
2525

2626
pub mod intrinsics;
27+
pub mod mem;

branches/try2/src/libstd/mem.rs renamed to branches/try2/src/libcore/mem.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
//! This module contains functions for querying the size and alignment of
1414
//! types, initializing and manipulating memory.
1515
16-
#![allow(missing_doc)] // FIXME
17-
1816
use cast;
1917
use ptr;
2018
use intrinsics;

branches/try2/src/libstd/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ extern crate core;
134134
#[cfg(test)] pub use owned = realstd::owned;
135135

136136
pub use core::intrinsics;
137+
pub use core::mem;
137138

138139
// Run tests with libgreen instead of libnative.
139140
//
@@ -243,8 +244,6 @@ pub mod path;
243244
pub mod cast;
244245
pub mod fmt;
245246
pub mod cleanup;
246-
pub mod mem;
247-
248247

249248
/* Unsupported interfaces */
250249

0 commit comments

Comments
 (0)