---

yaml
---
r: 139217
b: refs/heads/try2
c: 85c9fc6
h: refs/heads/master
i:
  139215: 6499636
v: v3

Author: pcwalton

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

branches/try2/src/libcore/flate.rs

@@ -41,10 +41,10 @@ pub mod rustrt {
     }
 }
 
-const lz_none : c_int = 0x0;   // Huffman-coding only.
-const lz_fast : c_int = 0x1;   // LZ with only one probe
-const lz_norm : c_int = 0x80;  // LZ with 128 probes, "normal"
-const lz_best : c_int = 0xfff; // LZ with 4095 probes, "best"
+static lz_none : c_int = 0x0;   // Huffman-coding only.
+static lz_fast : c_int = 0x1;   // LZ with only one probe
+static lz_norm : c_int = 0x80;  // LZ with 128 probes, "normal"
+static lz_best : c_int = 0xfff; // LZ with 4095 probes, "best"
 
 pub fn deflate_bytes(bytes: &[const u8]) -> ~[u8] {
     do vec::as_const_buf(bytes) |b, len| {

branches/try2/src/libcore/gc.rs

@@ -211,11 +211,11 @@ unsafe fn find_segment_for_frame(fp: *Word, segment: *StackSegment)
 
 type Memory = uint;
 
-const task_local_heap: Memory = 1;
-const exchange_heap:   Memory = 2;
-const stack:           Memory = 4;
+static task_local_heap: Memory = 1;
+static exchange_heap:   Memory = 2;
+static stack:           Memory = 4;
 
-const need_cleanup:    Memory = exchange_heap | stack;
+static need_cleanup:    Memory = exchange_heap | stack;
 
 // Walks stack, searching for roots of the requested type, and passes
 // each root to the visitor.

branches/try2/src/libcore/hashmap.rs

@@ -25,7 +25,7 @@ pub mod linear {
     use uint;
     use vec;
 
-    const INITIAL_CAPACITY: uint = 32u; // 2^5
+    static INITIAL_CAPACITY: uint = 32u; // 2^5
 
     struct Bucket<K,V> {
         hash: uint,