---

yaml
---
r: 143035
b: refs/heads/try2
c: 976d7a5
h: refs/heads/master
i:
  143033: a954e90
  143031: c1cc6e9
v: v3

Author: michaelwoerister

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 3a1db2d1e631feede472396fced1806dfd3cf677
+refs/heads/try2: 976d7a53cbb35d2f7814d2d13dcc55a304d5e7a7
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/Makefile.in

@@ -249,7 +249,7 @@ endef
 
 # Same interface as above, but deletes rather than just listing the files.
 define REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT
-  $(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "Warning: removing previous" \'$(2)\' "libraries:" $$MATCHES; rm $$MATCHES ; fi
+  $(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "Warning: removing previous" \'$(2)\' "libraries:" $$MATCHES; rm -v $$MATCHES ; fi
 endef
 
 # We use a different strategy for LIST_ALL_OLD_GLOB_MATCHES_EXCEPT

branches/try2/README.md

@@ -3,72 +3,18 @@
 This is a compiler for Rust, including standard libraries, tools and
 documentation.
 
-## Quick Start
 
-### Windows
+## Installation
 
-1. Download and use the [installer][win-exe].
-2. Read the [tutorial].
-2. Enjoy!
+The Rust compiler currently must be built from a [tarball], unless you
+are on Windows, in which case using the [installer][win-exe] is
+recommended.
 
-> ***Note:*** Windows users should read the detailed
-> [getting started][wiki-start] notes on the wiki. Even when using
-> the binary installer the Windows build requires a MinGW installation,
-> the precise details of which are not discussed here.
-
-[tutorial]: http://static.rust-lang.org/doc/tutorial.html
-[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
-
-### Linux / OS X
-
-1. Install the prerequisites (if not already installed)
-    * g++ 4.4 or clang++ 3.x
-    * python 2.6 or later (but not 3.x)
-    * perl 5.0 or later
-    * gnu make 3.81 or later
-    * curl
-2. Download and build Rust
-    You can either download a [tarball] or build directly from the [repo].
-    
-    To build from the [tarball] do:
-    
-        $ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
-        $ tar -xzf rust-0.7.tar.gz
-        $ cd rust-0.7
-    
-    Or to build from the [repo] do:
-
-        $ git clone https://github.com/mozilla/rust.git
-        $ cd rust
-
-    Now that you have Rust's source code, you can configure and build it:
-    
-        $ ./configure
-        $ make && make install
-    
-    You may need to use `sudo make install` if you do not normally have
-    permission to modify the destination directory. The install locations can
-    be adjusted by passing a `--prefix` argument to `configure`. Various other
-    options are also supported, pass `--help` for more information on them.
-
-    When complete, `make install` will place several programs into
-    `/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
-    API-documentation tool, and `rustpkg`, the Rust package manager and build
-    system.
-3. Read the [tutorial].
-4. Enjoy!
-
-[repo]: https://github.com/mozilla/rust
-[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
-[tutorial]: http://static.rust-lang.org/doc/tutorial.html
-
-## Notes
-
-Since the Rust compiler is written in Rust, it must be built by a
-precompiled "snapshot" version of itself (made in an earlier state of
-development). As such, source builds require a connection to the Internet, to
-fetch snapshots, and an OS that can execute the available snapshot binaries.
+Since the Rust compiler is written in Rust, it must be built by
+a precompiled "snapshot" version of itself (made in an earlier state
+of development). As such, source builds require a connection to
+the Internet, to fetch snapshots, and an OS that can execute the
+available snapshot binaries.
 
 Snapshot binaries are currently built and tested on several platforms:
 
@@ -79,12 +25,42 @@ Snapshot binaries are currently built and tested on several platforms:
 You may find that other platforms work, but these are our "tier 1"
 supported build environments that are most likely to work.
 
-Rust currently needs about 1.8G of RAM to build without swapping; if it hits
-swap, it will take a very long time to build.
+> ***Note:*** Windows users should read the detailed
+> [getting started][wiki-start] notes on the wiki. Even when using
+> the binary installer the Windows build requires a MinGW installation,
+> the precise details of which are not discussed here.
+
+To build from source you will also need the following prerequisite
+packages:
+
+* g++ 4.4 or clang++ 3.x
+* python 2.6 or later (but not 3.x)
+* perl 5.0 or later
+* gnu make 3.81 or later
+* curl
+
+Assuming you're on a relatively modern *nix system and have met the
+prerequisites, something along these lines should work.
+
+    $ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
+    $ tar -xzf rust-0.7.tar.gz
+    $ cd rust-0.7
+    $ ./configure
+    $ make && make install
 
-There is lots more documentation in the [wiki].
+You may need to use `sudo make install` if you do not normally have
+permission to modify the destination directory. The install locations
+can be adjusted by passing a `--prefix` argument to
+`configure`. Various other options are also supported, pass `--help`
+for more information on them.
 
-[wiki]: https://github.com/mozilla/rust/wiki
+When complete, `make install` will place several programs into
+`/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
+API-documentation tool, and `rustpkg`, the Rust package manager and build system.
+
+[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
+[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
+[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
 
 
 ## License
@@ -95,3 +71,8 @@ BSD-like licenses.
 
 See LICENSE-APACHE, LICENSE-MIT, and COPYRIGHT for details.
 
+## More help
+
+The [tutorial] is a good starting point.
+
+[tutorial]: http://static.rust-lang.org/doc/tutorial.html

branches/try2/configure

@@ -921,6 +921,9 @@ do
         esac
         need_ok "LLVM configure failed"
 
+        # Hack the tools Makefile to turn off the clang build
+        sed -i 's/clang//g' tools/Makefile
+
         cd $CFG_BUILD_DIR
     fi
 

branches/try2/doc/rust.md

@@ -573,7 +573,8 @@ The top level of this tree is a module that is anonymous (from the point of view
 
 The Rust compiler is always invoked with a single source file as input, and always produces a single output crate.
 The processing of that source file may result in other source files being loaded as modules.
-Source files have the extension `.rs`.
+Source files typically have the extension `.rs` but, by convention,
+source files that represent crates have the extension `.rc`, called *crate files*.
 
 A Rust source file describes a module, the name and
 location of which -- in the module tree of the current crate -- are defined
@@ -3285,7 +3286,7 @@ As an example, to see all the logs generated by the compiler, you would set
 you would set it to `rustc::metadata::creader`. To see just error logging
 use `rustc=0`.
 
-Note that when compiling source files that don't specify a
+Note that when compiling either `.rs` or `.rc` files that don't specify a
 crate name the crate is given a default name that matches the source file,
 with the extension removed. In that case, to turn on logging for a program
 compiled from, e.g. `helloworld.rs`, `RUST_LOG` should be set to `helloworld`.

branches/try2/src/libextra/arc.rs

@@ -50,9 +50,9 @@ use std::borrow;
 
 /// As sync::condvar, a mechanism for unlock-and-descheduling and signaling.
 pub struct Condvar<'self> {
-    priv is_mutex: bool,
-    priv failed: &'self mut bool,
-    priv cond: &'self sync::Condvar<'self>
+    is_mutex: bool,
+    failed: &'self mut bool,
+    cond: &'self sync::Condvar<'self>
 }
 
 impl<'self> Condvar<'self> {
@@ -108,7 +108,7 @@ impl<'self> Condvar<'self> {
  ****************************************************************************/
 
 /// An atomically reference counted wrapper for shared immutable state.
-pub struct ARC<T> { priv x: UnsafeAtomicRcBox<T> }
+pub struct ARC<T> { x: UnsafeAtomicRcBox<T> }
 
 /// Create an atomically reference counted wrapper.
 pub fn ARC<T:Freeze + Send>(data: T) -> ARC<T> {
@@ -123,20 +123,6 @@ impl<T:Freeze+Send> ARC<T> {
     pub fn get<'a>(&'a self) -> &'a T {
         unsafe { &*self.x.get_immut() }
     }
-
-    /**
-     * Retrieve the data back out of the ARC. This function blocks until the
-     * reference given to it is the last existing one, and then unwrap the data
-     * instead of destroying it.
-     *
-     * If multiple tasks call unwrap, all but the first will fail. Do not call
-     * unwrap from a task that holds another reference to the same ARC; it is
-     * guaranteed to deadlock.
-     */
-    pub fn unwrap(self) -> T {
-        let ARC { x: x } = self;
-        unsafe { x.unwrap() }
-    }
 }
 
 /**
@@ -157,9 +143,9 @@ impl<T:Freeze + Send> Clone for ARC<T> {
  ****************************************************************************/
 
 #[doc(hidden)]
-struct MutexARCInner<T> { priv lock: Mutex, priv failed: bool, priv data: T }
+struct MutexARCInner<T> { lock: Mutex, failed: bool, data: T }
 /// An ARC with mutable data protected by a blocking mutex.
-struct MutexARC<T> { priv x: UnsafeAtomicRcBox<MutexARCInner<T>> }
+struct MutexARC<T> { x: UnsafeAtomicRcBox<MutexARCInner<T>> }
 
 /// Create a mutex-protected ARC with the supplied data.
 pub fn MutexARC<T:Send>(user_data: T) -> MutexARC<T> {
@@ -239,22 +225,6 @@ impl<T:Send> MutexARC<T> {
                           cond: cond })
         }
     }
-
-    /**
-     * Retrieves the data, blocking until all other references are dropped,
-     * exactly as arc::unwrap.
-     *
-     * Will additionally fail if another task has failed while accessing the arc.
-     */
-    pub fn unwrap(self) -> T {
-        let MutexARC { x: x } = self;
-        let inner = unsafe { x.unwrap() };
-        let MutexARCInner { failed: failed, data: data, _ } = inner;
-        if failed {
-            fail!(~"Can't unwrap poisoned MutexARC - another task failed inside!");
-        }
-        data
-    }
 }
 
 // Common code for {mutex.access,rwlock.write}{,_cond}.
@@ -298,7 +268,7 @@ fn PoisonOnFail<'r>(failed: &'r mut bool) -> PoisonOnFail {
  ****************************************************************************/
 
 #[doc(hidden)]
-struct RWARCInner<T> { priv lock: RWlock, priv failed: bool, priv data: T }
+struct RWARCInner<T> { lock: RWlock, failed: bool, data: T }
 /**
  * A dual-mode ARC protected by a reader-writer lock. The data can be accessed
  * mutably or immutably, and immutably-accessing tasks may run concurrently.
@@ -308,7 +278,7 @@ struct RWARCInner<T> { priv lock: RWlock, priv failed: bool, priv data: T }
 #[mutable] // XXX remove after snap
 #[no_freeze]
 struct RWARC<T> {
-    priv x: UnsafeAtomicRcBox<RWARCInner<T>>,
+    x: UnsafeAtomicRcBox<RWARCInner<T>>,
 }
 
 /// Create a reader/writer ARC with the supplied data.
@@ -459,23 +429,6 @@ impl<T:Freeze + Send> RWARC<T> {
             }
         }
     }
-
-    /**
-     * Retrieves the data, blocking until all other references are dropped,
-     * exactly as arc::unwrap.
-     *
-     * Will additionally fail if another task has failed while accessing the arc
-     * in write mode.
-     */
-    pub fn unwrap(self) -> T {
-        let RWARC { x: x, _ } = self;
-        let inner = unsafe { x.unwrap() };
-        let RWARCInner { failed: failed, data: data, _ } = inner;
-        if failed {
-            fail!(~"Can't unwrap poisoned RWARC - another task failed inside!")
-        }
-        data
-    }
 }
 
 // Borrowck rightly complains about immutably aliasing the rwlock in order to
@@ -658,23 +611,6 @@ mod tests {
         }
     }
     #[test] #[should_fail] #[ignore(cfg(windows))]
-    pub fn test_mutex_arc_unwrap_poison() {
-        let arc = MutexARC(1);
-        let arc2 = ~(&arc).clone();
-        let (p, c) = comm::stream();
-        do task::spawn {
-            unsafe {
-                do arc2.access |one| {
-                    c.send(());
-                    assert!(*one == 2);
-                }
-            }
-        }
-        let _ = p.recv();
-        let one = arc.unwrap();
-        assert!(one == 1);
-    }
-    #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_rw_arc_poison_wr() {
         let arc = ~RWARC(1);
         let arc2 = (*arc).clone();

branches/try2/src/libextra/dlist.rs

@@ -208,7 +208,7 @@ impl<T> Deque<T> for DList<T> {
     ///
     /// O(1)
     fn pop_front(&mut self) -> Option<T> {
-        match self.list_head.take() {
+        match util::replace(&mut self.list_head, None) {
             None => None,
             Some(old_head) => {
                 self.length -= 1;

branches/try2/src/libextra/future.rs

@@ -60,19 +60,6 @@ impl<A:Clone> Future<A> {
     }
 }
 
-impl<A> Future<A> {
-    /// Gets the value from this future, forcing evaluation.
-    pub fn unwrap(self) -> A {
-        let mut this = self;
-        this.get_ref();
-        let state = replace(&mut this.state, Evaluating);
-        match state {
-            Forced(v) => v,
-            _ => fail!( "Logic error." ),
-        }
-    }
-}
-
 impl<A> Future<A> {
     pub fn get_ref<'a>(&'a mut self) -> &'a A {
         /*!
@@ -192,12 +179,6 @@ mod test {
         assert_eq!(f.get(), ~"fail");
     }
 
-    #[test]
-    fn test_interface_unwrap() {
-        let mut f = from_value(~"fail");
-        assert_eq!(f.unwrap(), ~"fail");
-    }
-
     #[test]
     fn test_get_ref_method() {
         let mut f = from_value(22);

branches/try2/src/libextra/ringbuf.rs

@@ -14,6 +14,7 @@
 //! extra::container::Deque`.
 
 use std::num;
+use std::util;
 use std::uint;
 use std::vec;
 use std::iterator::{FromIterator, InvertIterator};
@@ -71,7 +72,7 @@ impl<T> Deque<T> for RingBuf<T> {
 
     /// Remove and return the first element in the RingBuf, or None if it is empty
     fn pop_front(&mut self) -> Option<T> {
-        let result = self.elts[self.lo].take();
+        let result = util::replace(&mut self.elts[self.lo], None);
         if result.is_some() {
             self.lo = (self.lo + 1u) % self.elts.len();
             self.nelts -= 1u;
@@ -84,7 +85,7 @@ impl<T> Deque<T> for RingBuf<T> {
         if self.nelts > 0 {
             self.nelts -= 1;
             let hi = self.raw_index(self.nelts);
-            self.elts[hi].take()
+            util::replace(&mut self.elts[hi], None)
         } else {
             None
         }