---

yaml
---
r: 64836
b: refs/heads/snap-stage3
c: b6ea053
h: refs/heads/master
v: v3

Author: brendanzab

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: bb996bf92edc5c9a34275bae6143f1ada73e6c7f
+refs/heads/snap-stage3: b6ea0538a90f40ec940d2ae09e167ef2718dc507
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/doc/rustpkg.md

@@ -76,14 +76,6 @@ A package ID can also specify a version, like:
 `github.com/mozilla/rust#0.3`.
 In this case, `rustpkg` will check that the repository `github.com/mozilla/rust` has a tag named `0.3`,
 and report an error otherwise.
-A package ID can also specify a particular revision of a repository, like:
-`github.com/mozilla/rust#release-0.7`.
-When the refspec (portion of the package ID after the `#`) can't be parsed as a decimal number,
-rustpkg passes the refspec along to the version control system without interpreting it.
-rustpkg also interprets any dependencies on such a package ID literally
-(as opposed to versions, where a newer version satisfies a dependency on an older version).
-Thus, `github.com/mozilla/rust#5c4cd30f80` is also a valid package ID,
-since git can deduce that 5c4cd30f80 refers to a revision of the desired repository.
 
 ## Source files
 

branches/snap-stage3/doc/tutorial.md

@@ -309,7 +309,7 @@ was taken.
 
 In short, everything that's not a declaration (declarations are `let` for
 variables; `fn` for functions; and any top-level named items such as
-[traits](#traits), [enum types](#enums), and static items) is an
+[traits](#traits), [enum types](#enums), and [constants](#constants)) is an
 expression, including function bodies.
 
 ~~~~
@@ -992,7 +992,7 @@ task-local garbage collector. It will be destroyed at some point after there
 are no references left to the box, no later than the end of the task. Managed
 boxes lack an owner, so they start a new ownership tree and don't inherit
 mutability. They do own the contained object, and mutability is defined by the
-type of the managed box (`@` or `@mut`). An object containing a managed box is
+type of the shared box (`@` or `@mut`). An object containing a managed box is
 not `Owned`, and can't be sent between tasks.
 
 ~~~~
@@ -1089,8 +1089,10 @@ we might like to compute the distance between `on_the_stack` and
 to define a function that takes two arguments of type point—that is,
 it takes the points by value. But this will cause the points to be
 copied when we call the function. For points, this is probably not so
-bad, but often copies are expensive. So we’d like to define a function
-that takes the points by pointer. We can use borrowed pointers to do this:
+bad, but often copies are expensive or, worse, if there are mutable
+fields, they can change the semantics of your program. So we’d like to
+define a function that takes the points by pointer. We can use
+borrowed pointers to do this:
 
 ~~~
 # struct Point { x: float, y: float }
@@ -1373,7 +1375,7 @@ let exchange_crayons: ~str = ~"Black, BlizzardBlue, Blue";
 ~~~
 
 Both vectors and strings support a number of useful
-[methods](#methods), defined in [`std::vec`]
+[methods](#functions-and-methods), defined in [`std::vec`]
 and [`std::str`]. Here are some examples.
 
 [`std::vec`]: std/vec.html
@@ -1928,7 +1930,7 @@ that implements a trait includes the name of the trait at the start of
 the definition, as in the following impls of `Printable` for `int`
 and `~str`.
 
-[impls]: #methods
+[impls]: #functions-and-methods
 
 ~~~~
 # trait Printable { fn print(&self); }

branches/snap-stage3/src/compiletest/runtest.rs

@@ -22,7 +22,6 @@ use util::logv;
 
 use std::io;
 use std::os;
-use std::str;
 use std::uint;
 use std::vec;
 
@@ -356,30 +355,6 @@ fn check_expected_errors(expected_errors: ~[errors::ExpectedError],
         fmt!("%s:%u:", testfile.to_str(), ee.line)
     }).collect::<~[~str]>();
 
-    fn to_lower( s : &str ) -> ~str {
-        let i = s.iter();
-        let c : ~[char] = i.transform( |c| {
-            if c.is_ascii() {
-                c.to_ascii().to_lower().to_char()
-            } else {
-                c
-            }
-        } ).collect();
-        str::from_chars( c )
-    }
-
-    #[cfg(target_os = "win32")]
-    fn prefix_matches( line : &str, prefix : &str ) -> bool {
-        to_lower(line).starts_with( to_lower(prefix) )
-    }
-
-    #[cfg(target_os = "linux")]
-    #[cfg(target_os = "macos")]
-    #[cfg(target_os = "freebsd")]
-    fn prefix_matches( line : &str, prefix : &str ) -> bool {
-        line.starts_with( prefix )
-    }
-
     // Scan and extract our error/warning messages,
     // which look like:
     //    filename:line1:col1: line2:col2: *error:* msg
@@ -392,7 +367,7 @@ fn check_expected_errors(expected_errors: ~[errors::ExpectedError],
             if !found_flags[i] {
                 debug!("prefix=%s ee.kind=%s ee.msg=%s line=%s",
                        prefixes[i], ee.kind, ee.msg, line);
-                if (prefix_matches(line, prefixes[i]) &&
+                if (line.starts_with(prefixes[i]) &&
                     line.contains(ee.kind) &&
                     line.contains(ee.msg)) {
                     found_flags[i] = true;

branches/snap-stage3/src/libextra/dlist.rs

@@ -25,7 +25,7 @@
 use std::cast;
 use std::ptr;
 use std::util;
-use std::iterator::{FromIterator, Invert};
+use std::iterator::{FromIterator, InvertIterator};
 
 use container::Deque;
 
@@ -356,7 +356,7 @@ impl<T> DList<T> {
 
     /// Provide a reverse iterator
     #[inline]
-    pub fn rev_iter<'a>(&'a self) -> Invert<DListIterator<'a, T>> {
+    pub fn rev_iter<'a>(&'a self) -> InvertIterator<DListIterator<'a, T>> {
         self.iter().invert()
     }
 
@@ -376,7 +376,7 @@ impl<T> DList<T> {
     }
     /// Provide a reverse iterator with mutable references
     #[inline]
-    pub fn mut_rev_iter<'a>(&'a mut self) -> Invert<MutDListIterator<'a, T>> {
+    pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<MutDListIterator<'a, T>> {
         self.mut_iter().invert()
     }
 
@@ -389,7 +389,7 @@ impl<T> DList<T> {
 
     /// Consume the list into an iterator yielding elements by value, in reverse
     #[inline]
-    pub fn consume_rev_iter(self) -> Invert<ConsumeIterator<T>> {
+    pub fn consume_rev_iter(self) -> InvertIterator<ConsumeIterator<T>> {
         self.consume_iter().invert()
     }
 }

branches/snap-stage3/src/libextra/ringbuf.rs

@@ -16,7 +16,7 @@
 use std::num;
 use std::uint;
 use std::vec;
-use std::iterator::{FromIterator, Invert};
+use std::iterator::{FromIterator, InvertIterator};
 
 use container::Deque;
 
@@ -181,7 +181,7 @@ impl<T> RingBuf<T> {
     }
 
     /// Back-to-front iterator.
-    pub fn rev_iter<'a>(&'a self) -> Invert<RingBufIterator<'a, T>> {
+    pub fn rev_iter<'a>(&'a self) -> InvertIterator<RingBufIterator<'a, T>> {
         self.iter().invert()
     }
 
@@ -192,7 +192,7 @@ impl<T> RingBuf<T> {
     }
 
     /// Back-to-front iterator which returns mutable values.
-    pub fn mut_rev_iter<'a>(&'a mut self) -> Invert<RingBufMutIterator<'a, T>> {
+    pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<RingBufMutIterator<'a, T>> {
         self.mut_iter().invert()
     }
 }

branches/snap-stage3/src/libextra/smallintmap.rs

@@ -15,7 +15,7 @@
 
 #[allow(missing_doc)];
 
-use std::iterator::{Iterator, IteratorUtil, Enumerate, FilterMap, Invert};
+use std::iterator::{Iterator, IteratorUtil, EnumerateIterator, FilterMapIterator, InvertIterator};
 use std::uint;
 use std::util::replace;
 use std::vec::{VecIterator, VecMutIterator};
@@ -204,8 +204,8 @@ impl<V> SmallIntMap<V> {
 
     /// Empties the hash map, moving all values into the specified closure
     pub fn consume(&mut self)
-        -> FilterMap<(uint, Option<V>), (uint, V),
-                Enumerate<vec::ConsumeIterator<Option<V>>>>
+        -> FilterMapIterator<(uint, Option<V>), (uint, V),
+                EnumerateIterator<vec::ConsumeIterator<Option<V>>>>
     {
         let values = replace(&mut self.v, ~[]);
         values.consume_iter().enumerate().filter_map(|(i, v)| {
@@ -291,7 +291,7 @@ pub struct SmallIntMapIterator<'self, T> {
 
 iterator!(impl SmallIntMapIterator -> (uint, &'self T), get_ref)
 double_ended_iterator!(impl SmallIntMapIterator -> (uint, &'self T), get_ref)
-pub type SmallIntMapRevIterator<'self, T> = Invert<SmallIntMapIterator<'self, T>>;
+pub type SmallIntMapRevIterator<'self, T> = InvertIterator<SmallIntMapIterator<'self, T>>;
 
 pub struct SmallIntMapMutIterator<'self, T> {
     priv front: uint,
@@ -301,7 +301,7 @@ pub struct SmallIntMapMutIterator<'self, T> {
 
 iterator!(impl SmallIntMapMutIterator -> (uint, &'self mut T), get_mut_ref)
 double_ended_iterator!(impl SmallIntMapMutIterator -> (uint, &'self mut T), get_mut_ref)
-pub type SmallIntMapMutRevIterator<'self, T> = Invert<SmallIntMapMutIterator<'self, T>>;
+pub type SmallIntMapMutRevIterator<'self, T> = InvertIterator<SmallIntMapMutIterator<'self, T>>;
 
 #[cfg(test)]
 mod test_map {

branches/snap-stage3/src/librustc/middle/check_const.rs

@@ -160,7 +160,7 @@ pub fn check_expr(sess: Session,
           expr_field(*) |
           expr_index(*) |
           expr_tup(*) |
-          expr_struct(*) => { }
+          expr_struct(_, _, None) => { }
           expr_addr_of(*) => {
                 sess.span_err(
                     e.span,

branches/snap-stage3/src/librustc/middle/trans/consts.rs

@@ -485,30 +485,20 @@ fn const_expr_unadjusted(cx: @mut CrateContext, e: &ast::expr) -> ValueRef {
               let vals = es.map(|&e| const_expr(cx, e));
               adt::trans_const(cx, repr, 0, vals)
           }
-          ast::expr_struct(_, ref fs, ref base_opt) => {
+          ast::expr_struct(_, ref fs, None) => {
               let ety = ty::expr_ty(cx.tcx, e);
               let repr = adt::represent_type(cx, ety);
               let tcx = cx.tcx;
-
-              let base_val = match *base_opt {
-                Some(base) => Some(const_expr(cx, base)),
-                None => None
-              };
-
               do expr::with_field_tys(tcx, ety, Some(e.id))
                   |discr, field_tys| {
-                  let cs: ~[ValueRef] = field_tys.iter().enumerate()
-                      .transform(|(ix, &field_ty)| {
+                  let cs = field_tys.map(|field_ty| {
                       match fs.iter().find_(|f| field_ty.ident == f.ident) {
                           Some(f) => const_expr(cx, (*f).expr),
                           None => {
-                              match base_val {
-                                Some(bv) => adt::const_get_field(cx, repr, bv, discr, ix),
-                                None => cx.tcx.sess.span_bug(e.span, "missing struct field")
-                              }
+                              cx.tcx.sess.span_bug(e.span, "missing struct field");
                           }
                       }
-                  }).collect();
+                  });
                   adt::trans_const(cx, repr, discr, cs)
               }
           }

branches/snap-stage3/src/librustpkg/package_source.rs

@@ -11,13 +11,14 @@
 use target::*;
 use package_id::PkgId;
 use std::path::Path;
-use std::{os, str};
+use std::{os, run, str};
 use context::*;
 use crate::Crate;
 use messages::*;
-use source_control::{git_clone, git_clone_general};
+use source_control::git_clone;
 use path_util::pkgid_src_in_workspace;
 use util::compile_crate;
+use version::{ExactRevision, SemanticVersion, NoVersion};
 
 // An enumeration of the unpacked source of a package workspace.
 // This contains a list of files found in the source workspace.
@@ -101,13 +102,22 @@ impl PkgSrc {
         }
 
         let url = fmt!("https://%s", self.id.remote_path.to_str());
-        note(fmt!("Fetching package: git clone %s %s [version=%s]",
-                  url, local.to_str(), self.id.version.to_str()));
-        if git_clone_general(url, &local, &self.id.version) {
-            Some(local)
+        let branch_args = match self.id.version {
+                      NoVersion => ~[],
+                      ExactRevision(ref s) => ~[~"--branch", (*s).clone()],
+                      SemanticVersion(ref s) => ~[~"--branch", s.to_str()]
+        };
+
+
+        note(fmt!("Fetching package: git clone %s %s %?", url, local.to_str(), branch_args));
+
+        if run::process_output("git",
+                               ~[~"clone", url.clone(), local.to_str()] + branch_args).status != 0 {
+            note(fmt!("fetching %s failed: can't clone repository", url));
+            None
         }
         else {
-            None
+            Some(local)
         }
     }
 

branches/snap-stage3/src/librustpkg/path_util.rs

@@ -52,7 +52,6 @@ pub fn rust_path() -> ~[Path] {
         }
         None => ~[]
     };
-    debug!("RUST_PATH entries from environment: %?", env_rust_path);
     let cwd = os::getcwd();
     // now add in default entries
     env_rust_path.push(cwd.clone());
@@ -346,12 +345,7 @@ fn target_file_in_workspace(pkgid: &PkgId, workspace: &Path,
     let subdir = match what {
         Lib => "lib", Main | Test | Bench => "bin"
     };
-    // Artifacts in the build directory live in a package-ID-specific subdirectory,
-    // but installed ones don't.
-    let result = match where {
-                Build => workspace.push(subdir).push_rel(&*pkgid.local_path),
-                _     => workspace.push(subdir)
-    };
+    let result = workspace.push(subdir);
     if !os::path_exists(&result) && !mkdir_recursive(&result, U_RWX) {
         cond.raise((result.clone(), fmt!("target_file_in_workspace couldn't \
             create the %s dir (pkgid=%s, workspace=%s, what=%?, where=%?",