---

yaml
---
r: 12525
b: refs/heads/master
c: 01e20dd
h: refs/heads/master
i:
  12523: f0b9632
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e5f51bf5ef66da4c1db5c8f6a0892a4e76ef179d
+refs/heads/master: 01e20dd0b3d053736fbb868ec7ea6f083c29aacd
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/doc/keywords.txt

@@ -2,19 +2,19 @@
 
 alt any as assert
 be bind block bool break
-char check claim class const cont copy crust
+char check claim const cont
 do
-else enum export
+else export
 f32 f64 fail false float fn for
-i16 i32 i64 i8 if iface impl import in int
+i16 i32 i64 i8 if import in int
 let log loop
-mod move mut
-native new
+mod mut
+native note
 obj  
-priv pure
+prove pure
 resource ret
-self send str
-tag to trait true type
+self str syntax
+tag true type
 u16 u32 u64 u8 uint unchecked unsafe use
 vec
 while with

trunk/src/libcore/core.rc

@@ -7,25 +7,30 @@
 #[license = "MIT"];
 #[crate_type = "lib"];
 
-// Don't link to core. We are core.
-#[no_core];
-
 #[doc = "
-The Rust core library
-
-The core library provides functionality that is closely tied to the Rust
+The Rust core library provides functionality that is closely tied to the Rust
 built-in types and runtime services, or that is used in nearly every
 non-trivial program.
 
-It is linked by default to all crates and the contents imported. The effect is
-as though the user had written the following:
+`core` includes modules corresponding to each of the integer types, each of
+the floating point types, the `bool` type, tules, characters, strings, vectors
+(`vec`), shared boxes (`box`), and unsafe pointers (`ptr`).  Additionally,
+`core` provides very commonly used built-in types and operations, concurrency
+primitives, platform abstractions, I/O, and complete bindings to the C
+standard library.
+
+`core` is linked by default to all crates and the contents imported.
+Implicitly, all crates behave as if they included the following prologue:
 
     use core;
     import core::*;
 
-This behavior can be disabled with the `no_core` crate attribute.
+This behavior can be disabled with the `#[no_core]` crate attribute.
 "];
 
+// Don't link to core. We are core.
+#[no_core];
+
 export int, i8, i16, i32, i64;
 export uint, u8, u16, u32, u64;
 export float, f32, f64;
@@ -42,6 +47,7 @@ export to_str;
 // core this should become unexported
 export priv;
 
+
 // Built-in-type support modules
 
 #[doc = "Operations and constants for `int`"]
@@ -129,6 +135,7 @@ mod u64 {
     mod inst;
 }
 
+
 mod box;
 mod char;
 mod float;
@@ -138,48 +145,50 @@ mod str;
 mod ptr;
 mod vec;
 mod bool;
+mod tuple;
 
-// For internal use by char, not exported
-mod unicode;
-// Do not export
-mod priv;
 
 // Ubiquitous-utility-type modules
 
 mod either;
+mod iter;
+mod logging;
 mod option;
 mod result;
-mod tuple;
-mod iter;
+mod to_str;
 
-// Useful ifaces
 
-mod to_str;
+// Concurrency
+mod comm;
+mod task;
+mod future;
+
 
 // Runtime and language-primitive support
 
+mod io;
 mod libc;
 mod os;
-mod io;
-mod run;
-mod rand;
 mod path;
-
-mod cmath;
+mod rand;
+mod run;
 mod sys;
 mod unsafe;
-mod logging;
 
-// Concurrency
-mod comm;
-mod task;
-mod future;
 
-// Compiler support modules
+// Modules supporting compiler-generated code
+// Exported but not part of the public interface
 
 mod extfmt;
 
 
+// For internal use, not exported
+
+mod unicode;
+mod priv;
+mod cmath;
+
+
 // Local Variables:
 // mode: rust;
 // fill-column: 78;