Skip to content

Commit c499258

Browse files
committed
---
yaml --- r: 24033 b: refs/heads/master c: 7bf0aa1 h: refs/heads/master i: 24031: 7b4b51c v: v3
1 parent 0933652 commit c499258

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: cfed923600e2f7ad34241501200d595abccdeb54
2+
refs/heads/master: 7bf0aa1c4367fd6904f68457233c360dafb27a93
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/core.rc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ used features.
1010
`core` includes modules corresponding to each of the integer types, each of
1111
the floating point types, the `bool` type, tuples, characters, strings,
1212
vectors (`vec`), shared boxes (`box`), and unsafe and borrowed pointers
13-
(`ptr`). Additionally, `core` provides very commonly used built-in types
14-
and operations, concurrency primitives, platform abstractions, I/O, and
15-
complete bindings to the C standard library.
16-
17-
`core` is linked to all crates and its contents imported. Implicitly, all
18-
crates behave as if they included the following prologue:
13+
(`ptr`). Additionally, `core` provides task management and creation (`task`),
14+
communication primitives (`comm` and `pipes`), an efficient vector builder
15+
(`dvec`), platform abstractions (`os` and `path`), basic I/O abstractions
16+
(`io`), common traits (`cmp`, `num`, `to_str`), and complete bindings
17+
to the C standard library (`libc`).
18+
19+
`core` is linked to all crates by default and its contents imported.
20+
Implicitly, all crates behave as if they included the following prologue:
1921

2022
extern mod core;
2123
use core::*;

trunk/src/libcore/task.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ macro_rules! move_it (
8282
{ $x:expr } => { unsafe { let y <- *ptr::addr_of($x); move y } }
8383
)
8484

85-
/* Data types */
86-
8785
/// A handle to a task
8886
enum Task {
8987
TaskHandle(task_id)
@@ -800,7 +798,7 @@ unsafe fn atomically<U>(f: fn() -> U) -> U {
800798
f()
801799
}
802800

803-
/****************************************************************************
801+
/* **************************************************************************
804802
* Spawning & linked failure
805803
*
806804
* Several data structures are involved in task management to allow properly
@@ -1431,7 +1429,7 @@ fn spawn_raw(+opts: TaskOpts, +f: fn~()) {
14311429
}
14321430
}
14331431

1434-
/****************************************************************************
1432+
/* **************************************************************************
14351433
* Task local data management
14361434
*
14371435
* Allows storing boxes with arbitrary types inside, to be accessed anywhere

0 commit comments

Comments
 (0)