---

yaml
---
r: 44858
b: refs/heads/master
c: 332c046
h: refs/heads/master
v: v3

Author: ben0x539

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bcf626812b88f63932c541f81c7f68360e31a7c1
+refs/heads/master: 332c0460290ade81edf44b55d47edcb4990a3b5a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/doc/rust.md

@@ -1085,6 +1085,15 @@ let p = Point(10, 11);
 let px: int = match p { Point(x, _) => x };
 ~~~~
 
+A _unit-like struct_ is a structure without any fields, defined by leaving off the fields list entirely.
+Such types will have a single value, just like the [unit value `()`](#unit-and-boolean-literals) of the unit type.
+For example:
+
+~~~~
+struct Cookie;
+let c = [Cookie, Cookie, Cookie, Cookie];
+~~~~
+
 ### Enumerations
 
 An _enumeration_ is a simultaneous definition of a nominal [enumerated type](#enumerated-types) as well as a set of *constructors*,
@@ -1590,7 +1599,8 @@ struct_expr : expr_path '{' ident ':' expr
                       [ ',' ident ':' expr ] *
                       [ ".." expr ] '}' |
               expr_path '(' expr
-                      [ ',' expr ] * ')'
+                      [ ',' expr ] * ')' |
+              expr_path
 ~~~~~~~~
 
 There are several forms of structure expressions.
@@ -1600,23 +1610,28 @@ providing the field values of a new instance of the structure.
 A field name can be any identifier, and is separated from its value expression by a colon.
 To indicate that a field is mutable, the `mut` keyword is written before its name.
 
-A _tuple structure expression_ constists of the [path](#paths) of a [structure item](#structures),
+A _tuple structure expression_ consists of the [path](#paths) of a [structure item](#structures),
 followed by a parenthesized list of one or more comma-separated expressions
 (in other words, the path of a structured item followed by a tuple expression).
 The structure item must be a tuple structure item.
 
+A _unit-like structure expression_ consists only of the [path](#paths) of a [structure item](#structures).
+
 The following are examples of structure expressions:
 
 ~~~~
 # struct Point { x: float, y: float }
 # struct TuplePoint(float, float);
 # mod game { pub struct User { name: &str, age: uint, score: uint } }
+# struct Cookie; fn some_fn<T>(t: T) {}
 Point {x: 10f, y: 20f};
 TuplePoint(10f, 20f);
 let u = game::User {name: "Joe", age: 35u, score: 100_000};
+some_fn::<Cookie>(Cookie);
 ~~~~
 
 A structure expression forms a new value of the named structure type.
+Note that for a given *unit-like* structure type, this will always be the same value.
 
 A structure expression can terminate with the syntax `..` followed by an expression to denote a functional update.
 The expression following `..` (the base) must be of the same structure type as the new structure type being formed.
@@ -2643,7 +2658,10 @@ the resulting `struct` value will always be laid out in memory in the order spec
 The fields of a `struct` may be qualified by [visibility modifiers](#visibility-modifiers),
 to restrict access to implementation-private data in a structure.
 
-A `tuple struct` type is just like a structure type, except that the fields are anonymous.
+A _tuple struct_ type is just like a structure type, except that the fields are anonymous.
+
+A _unit-like struct_ type is like a structure type, except that it has no fields.
+The one value constructed by the associated [structure expression](#structure-expression) is the only value that inhabits such a type.
 
 ### Enumerated types
 

trunk/src/libcore/at_vec.rs

@@ -183,7 +183,7 @@ pub mod raw {
     use at_vec::{capacity, rustrt};
     use cast::transmute;
     use libc;
-    use unstable::intrinsics::{move_val_init};
+    use private::intrinsics::{move_val_init};
     use ptr::addr_of;
     use ptr;
     use sys;

trunk/src/libcore/comm.rs

@@ -12,7 +12,7 @@ use either::{Either, Left, Right};
 use kinds::Owned;
 use option;
 use option::{Option, Some, None, unwrap};
-use unstable;
+use private;
 use vec;
 
 use pipes::{recv, try_recv, wait_many, peek, PacketHeader};
@@ -242,7 +242,7 @@ impl<T: Owned> Peekable<T> for PortSet<T> {
 }
 
 /// A channel that can be shared between many senders.
-pub type SharedChan<T> = unstable::Exclusive<Chan<T>>;
+pub type SharedChan<T> = private::Exclusive<Chan<T>>;
 
 impl<T: Owned> GenericChan<T> for SharedChan<T> {
     fn send(x: T) {
@@ -268,7 +268,7 @@ impl<T: Owned> GenericSmartChan<T> for SharedChan<T> {
 
 /// Converts a `chan` into a `shared_chan`.
 pub fn SharedChan<T:Owned>(c: Chan<T>) -> SharedChan<T> {
-    unstable::exclusive(c)
+    private::exclusive(c)
 }
 
 /// Receive a message from one of two endpoints.

trunk/src/libcore/core.rc

@@ -228,12 +228,8 @@ pub const debug : u32 = 4_u32;
 // The runtime interface used by the compiler
 #[cfg(notest)] pub mod rt;
 // Private APIs
-pub mod unstable;
-// NOTE: Remove after snapshot
-#[cfg(stage0)]
-pub mod private {
-    pub use super::unstable::extfmt;
-}
+pub mod private;
+
 
 /* For internal use, not exported */
 

trunk/src/libcore/num/f32.rs

@@ -18,7 +18,7 @@ use num::strconv;
 use num;
 use ops;
 use option::Option;
-use unstable::intrinsics::floorf32;
+use private::intrinsics::floorf32;
 use from_str;
 use to_str;
 

trunk/src/libcore/num/f64.rs

@@ -19,7 +19,7 @@ use num::strconv;
 use num;
 use ops;
 use option::Option;
-use unstable::intrinsics::floorf64;
+use private::intrinsics::floorf64;
 use to_str;
 use from_str;
 

trunk/src/libcore/os.rs

@@ -35,6 +35,7 @@ use libc::{mode_t, pid_t, FILE};
 use option;
 use option::{Some, None};
 use prelude::*;
+use private;
 use ptr;
 use str;
 use task;
@@ -144,8 +145,8 @@ This uses a per-runtime lock to serialize access.
 FIXME #4726: It would probably be appropriate to make this a real global
 */
 fn with_env_lock<T>(f: &fn() -> T) -> T {
-    use unstable::global::global_data_clone_create;
-    use unstable::{Exclusive, exclusive};
+    use private::global::global_data_clone_create;
+    use private::{Exclusive, exclusive};
 
     struct SharedValue(());
     type ValueMutex = Exclusive<SharedValue>;

trunk/src/libcore/pipes.rs

@@ -91,9 +91,9 @@ use libc;
 use option;
 use option::{None, Option, Some, unwrap};
 use pipes;
-use unstable::intrinsics;
+use private::intrinsics;
 use ptr;
-use unstable;
+use private;
 use task;
 use vec;
 

trunk/src/libcore/prelude.rs

@@ -69,7 +69,7 @@ pub use option;
 pub use os;
 pub use path;
 pub use comm;
-pub use unstable;
+pub use private;
 pub use ptr;
 pub use rand;
 pub use result;

trunk/src/libcore/unstable.rs renamed to trunk/src/libcore/private.rs

@@ -22,19 +22,19 @@ use task;
 use task::{TaskBuilder, atomically};
 use uint;
 
-#[path = "unstable/at_exit.rs"]
+#[path = "private/at_exit.rs"]
 pub mod at_exit;
-#[path = "unstable/global.rs"]
+#[path = "private/global.rs"]
 pub mod global;
-#[path = "unstable/finally.rs"]
+#[path = "private/finally.rs"]
 pub mod finally;
-#[path = "unstable/weak_task.rs"]
+#[path = "private/weak_task.rs"]
 pub mod weak_task;
-#[path = "unstable/exchange_alloc.rs"]
+#[path = "private/exchange_alloc.rs"]
 pub mod exchange_alloc;
-#[path = "unstable/intrinsics.rs"]
+#[path = "private/intrinsics.rs"]
 pub mod intrinsics;
-#[path = "unstable/extfmt.rs"]
+#[path = "private/extfmt.rs"]
 pub mod extfmt;
 
 extern mod rustrt {
@@ -312,7 +312,7 @@ pub mod tests {
     use cell::Cell;
     use comm;
     use option;
-    use super::exclusive;
+    use private::exclusive;
     use result;
     use task;
     use uint;

trunk/src/libcore/unstable/at_exit.rs renamed to trunk/src/libcore/private/at_exit.rs

@@ -14,7 +14,7 @@ use c_malloc = libc::malloc;
 use c_free = libc::free;
 use managed::raw::{BoxHeaderRepr, BoxRepr};
 use cast::transmute;
-use unstable::intrinsics::{atomic_xadd,atomic_xsub};
+use private::intrinsics::{atomic_xadd,atomic_xsub};
 use ptr::null;
 use intrinsic::TyDesc;
 

trunk/src/libcore/unstable/exchange_alloc.rs renamed to trunk/src/libcore/private/exchange_alloc.rs

@@ -32,11 +32,11 @@ use libc::{c_void, uintptr_t};
 use option::{Option, Some, None};
 use ops::Drop;
 use pipes;
-use unstable::{Exclusive, exclusive};
-use unstable::{SharedMutableState, shared_mutable_state};
-use unstable::{get_shared_immutable_state};
-use unstable::at_exit::at_exit;
-use unstable::intrinsics::atomic_cxchg;
+use private::{Exclusive, exclusive};
+use private::{SharedMutableState, shared_mutable_state};
+use private::{get_shared_immutable_state};
+use private::at_exit::at_exit;
+use private::intrinsics::atomic_cxchg;
 use hashmap::linear::LinearMap;
 use sys::Closure;
 use task::spawn;

trunk/src/libcore/unstable/extfmt.rs renamed to trunk/src/libcore/private/extfmt.rs

@@ -24,9 +24,9 @@ use comm::{Port, Chan, SharedChan, GenericChan, GenericPort};
 use hashmap::linear::LinearMap;
 use ops::Drop;
 use option::{Some, None, swap_unwrap};
-use unstable::at_exit::at_exit;
-use unstable::finally::Finally;
-use unstable::global::global_data_clone_create;
+use private::at_exit::at_exit;
+use private::finally::Finally;
+use private::global::global_data_clone_create;
 use task::rt::{task_id, get_task_id};
 use task::{Task, task, spawn};
 

trunk/src/libcore/unstable/finally.rs renamed to trunk/src/libcore/private/finally.rs

@@ -14,7 +14,7 @@ use cast;
 use cmp::{Eq, Ord};
 use libc;
 use libc::{c_void, size_t};
-use unstable::intrinsics::{memmove32,memmove64};
+use private::intrinsics::{memmove32,memmove64};
 use ptr;
 use str;
 use sys;

trunk/src/libcore/unstable/global.rs renamed to trunk/src/libcore/private/global.rs

@@ -15,7 +15,7 @@ use libc::{c_char, c_uchar, c_void, size_t, uintptr_t, c_int};
 use managed::raw::BoxRepr;
 use str;
 use sys;
-use unstable::exchange_alloc;
+use private::exchange_alloc;
 use cast::transmute;
 
 use gc::{cleanup_stack_for_failure, gc, Word};

trunk/src/libcore/unstable/intrinsics.rs renamed to trunk/src/libcore/private/intrinsics.rs

@@ -79,7 +79,7 @@ use option;
 use comm::{Chan, GenericChan, GenericPort, Port, stream};
 use pipes;
 use prelude::*;
-use unstable;
+use private;
 use ptr;
 use hashmap::linear::LinearSet;
 use task::local_data_priv::{local_get, local_set};
@@ -123,7 +123,7 @@ struct TaskGroupData {
     // tasks in this group.
     mut descendants: TaskSet,
 }
-type TaskGroupArc = unstable::Exclusive<Option<TaskGroupData>>;
+type TaskGroupArc = private::Exclusive<Option<TaskGroupData>>;
 
 type TaskGroupInner = &mut Option<TaskGroupData>;
 
@@ -153,7 +153,7 @@ struct AncestorNode {
     mut ancestors:    AncestorList,
 }
 
-enum AncestorList = Option<unstable::Exclusive<AncestorNode>>;
+enum AncestorList = Option<private::Exclusive<AncestorNode>>;
 
 // Accessors for taskgroup arcs and ancestor arcs that wrap the unsafety.
 #[inline(always)]
@@ -162,7 +162,7 @@ fn access_group<U>(x: &TaskGroupArc, blk: fn(TaskGroupInner) -> U) -> U {
 }
 
 #[inline(always)]
-fn access_ancestors<U>(x: &unstable::Exclusive<AncestorNode>,
+fn access_ancestors<U>(x: &private::Exclusive<AncestorNode>,
                        blk: fn(x: &mut AncestorNode) -> U) -> U {
     unsafe { x.with(blk) }
 }
@@ -458,7 +458,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
                 // Main task, doing first spawn ever. Lazily initialise here.
                 let mut members = new_taskset();
                 taskset_insert(&mut members, spawner);
-                let tasks = unstable::exclusive(Some(TaskGroupData {
+                let tasks = private::exclusive(Some(TaskGroupData {
                     members: members,
                     descendants: new_taskset(),
                 }));
@@ -482,7 +482,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
             (g, a, spawner_group.is_main)
         } else {
             // Child is in a separate group from spawner.
-            let g = unstable::exclusive(Some(TaskGroupData {
+            let g = private::exclusive(Some(TaskGroupData {
                 members:     new_taskset(),
                 descendants: new_taskset(),
             }));
@@ -502,7 +502,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
                     };
                 assert new_generation < uint::max_value;
                 // Build a new node in the ancestor list.
-                AncestorList(Some(unstable::exclusive(AncestorNode {
+                AncestorList(Some(private::exclusive(AncestorNode {
                     generation: new_generation,
                     parent_group: Some(spawner_group.tasks.clone()),
                     ancestors: old_ancestors,

trunk/src/libcore/unstable/weak_task.rs renamed to trunk/src/libcore/private/weak_task.rs

@@ -22,7 +22,7 @@ use kinds::Copy;
 use libc;
 use libc::size_t;
 use option::{None, Option, Some};
-use unstable::intrinsics;
+use private::intrinsics;
 use ptr;
 use ptr::addr_of;
 use sys;
@@ -2008,7 +2008,7 @@ pub mod raw {
     use managed;
     use option::{None, Some};
     use option;
-    use unstable::intrinsics;
+    use private::intrinsics;
     use ptr::addr_of;
     use ptr;
     use sys;
@@ -2622,8 +2622,8 @@ mod tests {
     #[test]
     fn test_swap_remove_noncopyable() {
         // Tests that we don't accidentally run destructors twice.
-        let mut v = ~[::unstable::exclusive(()), ::unstable::exclusive(()),
-                      ::unstable::exclusive(())];
+        let mut v = ~[::private::exclusive(()), ::private::exclusive(()),
+                      ::private::exclusive(())];
         let mut _e = v.swap_remove(0);
         assert (len(v) == 2);
         _e = v.swap_remove(1);

trunk/src/libcore/ptr.rs

@@ -20,9 +20,9 @@ use core::cast;
 use core::cell::Cell;
 use core::pipes;
 use core::prelude::*;
-use core::unstable::{SharedMutableState, shared_mutable_state};
-use core::unstable::{clone_shared_mutable_state};
-use core::unstable::{get_shared_mutable_state, get_shared_immutable_state};
+use core::private::{SharedMutableState, shared_mutable_state};
+use core::private::{clone_shared_mutable_state};
+use core::private::{get_shared_mutable_state, get_shared_immutable_state};
 use core::ptr;
 use core::task;
 use core::util;

trunk/src/libcore/rt.rs

@@ -19,7 +19,7 @@ use core::cell::Cell;
 use core::option;
 use core::pipes;
 use core::prelude::*;
-use core::unstable::{Exclusive, exclusive};
+use core::private::{Exclusive, exclusive};
 use core::ptr;
 use core::task;
 use core::util;