---

yaml
---
r: 149079
b: refs/heads/try2
c: 3794d68
h: refs/heads/master
i:
  149077: 5806856
  149075: cd8df34
  149071: f73e182
v: v3

Author: bors

[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: e25701132c184dbf419ce0333b5612de7af4689e
+refs/heads/try2: 3794d681b3479224917c0efb7a769c2583a4ee0e
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/Makefile.in

@@ -126,9 +126,9 @@ ifdef TRACE
 endif
 ifdef CFG_DISABLE_RPATH
 # NOTE: make this CFG_RUSTC_FLAGS after stage0 snapshot
-RUSTFLAGS_STAGE1 += --no-rpath
-RUSTFLAGS_STAGE2 += --no-rpath
-RUSTFLAGS_STAGE3 += --no-rpath
+RUSTFLAGS_STAGE1 += -C no-rpath
+RUSTFLAGS_STAGE2 += -C no-rpath
+RUSTFLAGS_STAGE3 += -C no-rpath
 endif
 
 # The executables crated during this compilation process have no need to include

branches/try2/src/doc/index.md

@@ -40,6 +40,7 @@ li {list-style-type: none; }
 * [The `arena` allocation library](arena/index.html)
 * [The `collections` library](collections/index.html)
 * [The `flate` compression library](flate/index.html)
+* [The `fourcc` four-character code library](fourcc/index.html)
 * [The `getopts` argument parsing library](getopts/index.html)
 * [The `glob` file path matching library](glob/index.html)
 * [The `semver` version collation library](semver/index.html)

branches/try2/src/etc/snapshot.py

@@ -11,21 +11,21 @@
 import re, os, sys, glob, tarfile, shutil, subprocess, tempfile, distutils.spawn
 
 try:
-    import hashlib
-    sha_func = hashlib.sha1
+  import hashlib
+  sha_func = hashlib.sha1
 except ImportError:
-    import sha
-    sha_func = sha.new
+  import sha
+  sha_func = sha.new
 
 def scrub(b):
-    if sys.version_info >= (3,) and type(b) == bytes:
-        return b.decode('ascii')
-    else:
-        return b
+  if sys.version_info >= (3,) and type(b) == bytes:
+    return b.decode('ascii')
+  else:
+    return b
 
 src_dir = scrub(os.getenv("CFG_SRC_DIR"))
 if not src_dir:
-    raise Exception("missing env var CFG_SRC_DIR")
+  raise Exception("missing env var CFG_SRC_DIR")
 
 snapshotfile = os.path.join(src_dir, "src", "snapshots.txt")
 download_url_base = "http://static.rust-lang.org/stage0-snapshots"
@@ -39,36 +39,37 @@ def scrub(b):
     "freebsd": ["bin/rustc"],
     }
 
-winnt_runtime_deps = ["libgcc_s_dw2-1.dll", "libstdc++-6.dll"]
+winnt_runtime_deps = ["libgcc_s_dw2-1.dll",
+                      "libstdc++-6.dll"]
 
 def parse_line(n, line):
-    global snapshotfile
+  global snapshotfile
 
-    if re.match(r"\s*$", line): return None
+  if re.match(r"\s*$", line): return None
 
-    if re.match(r"^T\s*$", line): return None
+  if re.match(r"^T\s*$", line): return None
 
-    match = re.match(r"\s+([\w_-]+) ([a-fA-F\d]{40})\s*$", line)
-    if match:
-        return { "type": "file",
-                 "platform": match.group(1),
-                 "hash": match.group(2).lower() }
+  match = re.match(r"\s+([\w_-]+) ([a-fA-F\d]{40})\s*$", line)
+  if match:
+    return { "type": "file",
+             "platform": match.group(1),
+             "hash": match.group(2).lower() }
 
-    match = re.match(r"([ST]) (\d{4}-\d{2}-\d{2}) ([a-fA-F\d]+)\s*$", line);
-    if not match:
-        raise Exception("%s:%d:E syntax error: " % (snapshotfile, n))
-    return { "type": "snapshot",
-             "date": match.group(2),
-             "rev": match.group(3) }
+  match = re.match(r"([ST]) (\d{4}-\d{2}-\d{2}) ([a-fA-F\d]+)\s*$", line);
+  if (not match):
+    raise Exception("%s:%d:E syntax error: " % (snapshotfile, n))
+  return {"type": "snapshot",
+          "date": match.group(2),
+          "rev": match.group(3)}
 
 
 def partial_snapshot_name(date, rev, platform):
-    return ("rust-stage0-%s-%s-%s.tar.bz2"
-                    % (date, rev, platform))
+  return ("rust-stage0-%s-%s-%s.tar.bz2"
+          % (date, rev, platform))
 
 def full_snapshot_name(date, rev, platform, hsh):
-    return ("rust-stage0-%s-%s-%s-%s.tar.bz2"
-                    % (date, rev, platform, hsh))
+  return ("rust-stage0-%s-%s-%s-%s.tar.bz2"
+          % (date, rev, platform, hsh))
 
 
 def get_kernel(triple):
@@ -85,22 +86,23 @@ def get_kernel(triple):
 def get_cpu(triple):
     arch = triple.split('-')[0]
     if arch == "i686":
-        return "i386"
+      return "i386"
     return arch
 
 def get_platform(triple):
-    return "%s-%s" % (get_kernel(triple), get_cpu(triple))
+  return "%s-%s" % (get_kernel(triple), get_cpu(triple))
 
 
 def cmd_out(cmdline):
-    p = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
+    p = subprocess.Popen(cmdline,
+                         stdout=subprocess.PIPE)
     return scrub(p.communicate()[0].strip())
 
 
 def local_rev_info(field):
     return cmd_out(["git", "--git-dir=" + os.path.join(src_dir, ".git"),
-                            "log", "-n", "1",
-                            "--format=%%%s" % field, "HEAD"])
+                    "log", "-n", "1",
+                    "--format=%%%s" % field, "HEAD"])
 
 
 def local_rev_full_sha():
@@ -133,10 +135,10 @@ def get_url_to_file(u,f):
     os.rename(tmpf, f)
 
 def snap_filename_hash_part(snap):
-    match = re.match(r".*([a-fA-F\d]{40}).tar.bz2$", snap)
-    if not match:
-        raise Exception("unable to find hash in filename: " + snap)
-    return match.group(1)
+  match = re.match(r".*([a-fA-F\d]{40}).tar.bz2$", snap)
+  if not match:
+    raise Exception("unable to find hash in filename: " + snap)
+  return match.group(1)
 
 def hash_file(x):
     h = sha_func()
@@ -148,13 +150,13 @@ def get_winnt_runtime_deps():
     runtime_deps = []
     path_dirs = os.environ["PATH"].split(';')
     for name in winnt_runtime_deps:
-        for dir in path_dirs:
-            matches = glob.glob(os.path.join(dir, name))
-            if matches:
-                runtime_deps.append(matches[0])
-                break
-            else:
-                raise Exception("Could not find runtime dependency: %s" % name)
+      for dir in path_dirs:
+        matches = glob.glob(os.path.join(dir, name))
+        if matches:
+          runtime_deps.append(matches[0])
+          break
+      else:
+        raise Exception("Could not find runtime dependency: %s" % name)
     return runtime_deps
 
 def make_snapshot(stage, triple):
@@ -166,31 +168,31 @@ def make_snapshot(stage, triple):
     file0 = partial_snapshot_name(date, rev, platform)
 
     def in_tar_name(fn):
-        cs = re.split(r"[\\/]", fn)
-        if len(cs) >= 2:
-            return os.sep.join(cs[-2:])
+      cs = re.split(r"[\\/]", fn)
+      if len(cs) >= 2:
+        return os.sep.join(cs[-2:])
 
     tar = tarfile.open(file0, "w:bz2")
 
     for name in snapshot_files[kernel]:
-        dir = stage
-        if stage == "stage1" and re.match(r"^lib/(lib)?std.*", name):
-            dir = "stage0"
-        fn_glob = os.path.join(triple, dir, name)
-        matches = glob.glob(fn_glob)
-        if not matches:
-            raise Exception("Not found file with name like " + fn_glob)
-        if len(matches) == 1:
-            tar.add(matches[0], "rust-stage0/" + in_tar_name(matches[0]))
-        else:
-            raise Exception("Found stale files: \n  %s\n"
-                    "Please make a clean build." % "\n  ".join(matches))
+      dir = stage
+      if stage == "stage1" and re.match(r"^lib/(lib)?std.*", name):
+        dir = "stage0"
+      fn_glob = os.path.join(triple, dir, name)
+      matches = glob.glob(fn_glob)
+      if not matches:
+        raise Exception("Not found file with name like " + fn_glob)
+      if len(matches) == 1:
+        tar.add(matches[0], "rust-stage0/" + in_tar_name(matches[0]))
+      else:
+        raise Exception("Found stale files: \n  %s\n"
+                        "Please make a clean build." % "\n  ".join(matches))
 
     if kernel=="winnt":
-        for path in get_winnt_runtime_deps():
-            tar.add(path, "rust-stage0/bin/" + os.path.basename(path))
-        tar.add(os.path.join(os.path.dirname(__file__), "third-party"),
-                        "rust-stage0/bin/third-party")
+      for path in get_winnt_runtime_deps():
+        tar.add(path, "rust-stage0/bin/" + os.path.basename(path))
+      tar.add(os.path.join(os.path.dirname(__file__), "third-party"),
+              "rust-stage0/bin/third-party")
 
     tar.close()
 
@@ -202,59 +204,59 @@ def in_tar_name(fn):
     return file1
 
 def curr_snapshot_rev():
-    i = 0
-    found_snap = False
-    date = None
-    rev = None
+  i = 0
+  found_snap = False
+  date = None
+  rev = None
 
-    f = open(snapshotfile)
-    for line in f.readlines():
-        i += 1
-        parsed = parse_line(i, line)
-        if (not parsed): continue
+  f = open(snapshotfile)
+  for line in f.readlines():
+    i += 1
+    parsed = parse_line(i, line)
+    if (not parsed): continue
 
-        if parsed["type"] == "snapshot":
-            date = parsed["date"]
-            rev = parsed["rev"]
-            found_snap = True
-            break
+    if parsed["type"] == "snapshot":
+      date = parsed["date"]
+      rev = parsed["rev"]
+      found_snap = True
+      break
 
-    if not found_snap:
-        raise Exception("no snapshot entries in file")
+  if not found_snap:
+    raise Exception("no snapshot entries in file")
 
-    return (date, rev)
+  return (date, rev)
 
 def determine_curr_snapshot(triple):
-    i = 0
-    platform = get_platform(triple)
-
-    found_file = False
-    found_snap = False
-    hsh = None
-    date = None
-    rev = None
-
-    f = open(snapshotfile)
-    for line in f.readlines():
-        i += 1
-        parsed = parse_line(i, line)
-        if (not parsed): continue
-
-        if found_snap and parsed["type"] == "file":
-            if parsed["platform"] == platform:
-                hsh = parsed["hash"]
-                found_file = True
-                break;
-        elif parsed["type"] == "snapshot":
-            date = parsed["date"]
-            rev = parsed["rev"]
-            found_snap = True
-
-    if not found_snap:
-        raise Exception("no snapshot entries in file")
-
-    if not found_file:
-        raise Exception("no snapshot file found for platform %s, rev %s" %
-                                        (platform, rev))
-
-    return full_snapshot_name(date, rev, platform, hsh)
+  i = 0
+  platform = get_platform(triple)
+
+  found_file = False
+  found_snap = False
+  hsh = None
+  date = None
+  rev = None
+
+  f = open(snapshotfile)
+  for line in f.readlines():
+    i += 1
+    parsed = parse_line(i, line)
+    if (not parsed): continue
+
+    if found_snap and parsed["type"] == "file":
+      if parsed["platform"] == platform:
+        hsh = parsed["hash"]
+        found_file = True
+        break;
+    elif parsed["type"] == "snapshot":
+      date = parsed["date"]
+      rev = parsed["rev"]
+      found_snap = True
+
+  if not found_snap:
+    raise Exception("no snapshot entries in file")
+
+  if not found_file:
+    raise Exception("no snapshot file found for platform %s, rev %s" %
+                    (platform, rev))
+
+  return full_snapshot_name(date, rev, platform, hsh)

branches/try2/src/libarena/lib.rs

@@ -40,7 +40,6 @@ use std::rc::Rc;
 use std::rt::global_heap;
 use std::unstable::intrinsics::{TyDesc, get_tydesc};
 use std::unstable::intrinsics;
-use std::util;
 use std::vec;
 
 // The way arena uses arrays is really deeply awful. The arrays are
@@ -404,7 +403,7 @@ impl TypedArenaChunk {
         }
 
         // Destroy the next chunk.
-        let next_opt = util::replace(&mut self.next, None);
+        let next_opt = mem::replace(&mut self.next, None);
         match next_opt {
             None => {}
             Some(mut next) => {

branches/try2/src/libcollections/dlist.rs

@@ -23,8 +23,8 @@
 // the reverse direction.
 
 use std::cast;
+use std::mem::{replace, swap};
 use std::ptr;
-use std::util;
 use std::iter::Rev;
 use std::iter;
 
@@ -102,7 +102,7 @@ impl<T> Rawlink<T> {
 
     /// Return the `Rawlink` and replace with `Rawlink::none()`
     fn take(&mut self) -> Rawlink<T> {
-        util::replace(self, Rawlink::none())
+        replace(self, Rawlink::none())
     }
 }
 
@@ -161,7 +161,7 @@ impl<T> DList<T> {
             Some(ref mut head) => {
                 new_head.prev = Rawlink::none();
                 head.prev = Rawlink::some(new_head);
-                util::swap(head, &mut new_head);
+                swap(head, &mut new_head);
                 head.next = Some(new_head);
             }
         }
@@ -319,7 +319,7 @@ impl<T> DList<T> {
     /// O(1)
     #[inline]
     pub fn prepend(&mut self, mut other: DList<T>) {
-        util::swap(self, &mut other);
+        swap(self, &mut other);
         self.append(other);
     }