---

yaml
---
r: 146333
b: refs/heads/try2
c: e976de3
h: refs/heads/master
i:
  146331: 2cc4131
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: a6cd20bff93054d29bd232aebca59803ce64013b
+refs/heads/try2: e976de32dc590f759e6c0c72d286844ca373e775
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/treemap.rs

@@ -145,7 +145,7 @@ impl<K: TotalOrd, V> TreeMap<K, V> {
     pub fn iter<'a>(&'a self) -> TreeMapIterator<'a, K, V> {
         TreeMapIterator {
             stack: ~[],
-            node: &self.root,
+            node: deref(&self.root),
             remaining_min: self.length,
             remaining_max: self.length
         }
@@ -162,7 +162,7 @@ impl<K: TotalOrd, V> TreeMap<K, V> {
     fn iter_for_traversal<'a>(&'a self) -> TreeMapIterator<'a, K, V> {
         TreeMapIterator {
             stack: ~[],
-            node: &self.root,
+            node: deref(&self.root),
             remaining_min: 0,
             remaining_max: self.length
         }
@@ -173,8 +173,8 @@ impl<K: TotalOrd, V> TreeMap<K, V> {
     pub fn lower_bound_iter<'a>(&'a self, k: &K) -> TreeMapIterator<'a, K, V> {
         let mut iter: TreeMapIterator<'a, K, V> = self.iter_for_traversal();
         loop {
-            match *iter.node {
-              Some(ref r) => {
+            match iter.node {
+              Some(r) => {
                 match k.cmp(&r.key) {
                   Less => iter_traverse_left(&mut iter),
                   Greater => iter_traverse_right(&mut iter),
@@ -197,8 +197,8 @@ impl<K: TotalOrd, V> TreeMap<K, V> {
     pub fn upper_bound_iter<'a>(&'a self, k: &K) -> TreeMapIterator<'a, K, V> {
         let mut iter: TreeMapIterator<'a, K, V> = self.iter_for_traversal();
         loop {
-            match *iter.node {
-              Some(ref r) => {
+            match iter.node {
+              Some(r) => {
                 match k.cmp(&r.key) {
                   Less => iter_traverse_left(&mut iter),
                   Greater => iter_traverse_right(&mut iter),
@@ -229,24 +229,34 @@ impl<K: TotalOrd, V> TreeMap<K, V> {
 
 /// Lazy forward iterator over a map
 pub struct TreeMapIterator<'self, K, V> {
-    priv stack: ~[&'self ~TreeNode<K, V>],
-    priv node: &'self Option<~TreeNode<K, V>>,
+    priv stack: ~[&'self TreeNode<K, V>],
+    priv node: Option<&'self TreeNode<K, V>>,
     priv remaining_min: uint,
     priv remaining_max: uint
 }
 
+fn deref<'a, K, V>(node: &'a Option<~TreeNode<K, V>>) -> Option<&'a TreeNode<K, V>> {
+    match *node {
+        Some(ref n) => {
+            let n: &TreeNode<K, V> = *n;
+            Some(n)
+        }
+        None => None
+    }
+}
+
 impl<'self, K, V> TreeMapIterator<'self, K, V> {
     #[inline(always)]
     fn next_(&mut self, forward: bool) -> Option<(&'self K, &'self V)> {
         while !self.stack.is_empty() || self.node.is_some() {
-            match *self.node {
-              Some(ref x) => {
+            match self.node {
+              Some(x) => {
                 self.stack.push(x);
-                self.node = if forward { &x.left } else { &x.right };
+                self.node = deref(if forward { &x.left } else { &x.right });
               }
               None => {
                 let res = self.stack.pop();
-                self.node = if forward { &res.right } else { &res.left };
+                self.node = deref(if forward { &res.right } else { &res.left });
                 self.remaining_max -= 1;
                 if self.remaining_min > 0 {
                     self.remaining_min -= 1;
@@ -302,14 +312,14 @@ impl<'self, K, V> Iterator<(&'self K, &'self V)> for TreeMapRevIterator<'self, K
 ///   - complete initialization with `iter_traverse_complete`
 #[inline]
 fn iter_traverse_left<'a, K, V>(it: &mut TreeMapIterator<'a, K, V>) {
-    let node = it.node.get_ref();
+    let node = it.node.unwrap();
     it.stack.push(node);
-    it.node = &node.left;
+    it.node = deref(&node.left);
 }
 
 #[inline]
 fn iter_traverse_right<'a, K, V>(it: &mut TreeMapIterator<'a, K, V>) {
-    it.node = &(it.node.get_ref().right);
+    it.node = deref(&it.node.get_ref().right);
 }
 
 /// iter_traverse_left, iter_traverse_right and iter_traverse_complete are used to
@@ -321,11 +331,10 @@ fn iter_traverse_right<'a, K, V>(it: &mut TreeMapIterator<'a, K, V>) {
 /// traversed left.
 #[inline]
 fn iter_traverse_complete<'a, K, V>(it: &mut TreeMapIterator<'a, K, V>) {
-    static none: Option<~TreeNode<K, V>> = None;
-    match *it.node {
-        Some(ref n) => {
+    match it.node {
+        Some(n) => {
             it.stack.push(n);
-            it.node = &none;
+            it.node = None;
         }
         None => ()
     }

branches/try2/src/librustc/middle/resolve.rs

@@ -3488,10 +3488,17 @@ impl Resolver {
                     return None;
                 }
                 ConstantItemRibKind => {
-                    // Still doesn't deal with upvars
-                    self.resolve_error(span,
-                                          "attempt to use a non-constant \
-                                           value in a constant");
+                    if is_ty_param {
+                        // see #9186
+                        self.resolve_error(span,
+                                              "cannot use an outer type \
+                                               parameter in this context");
+                    } else {
+                        // Still doesn't deal with upvars
+                        self.resolve_error(span,
+                                              "attempt to use a non-constant \
+                                               value in a constant");
+                    }
 
                 }
             }
@@ -3764,7 +3771,9 @@ impl Resolver {
 
     fn with_constant_rib(&mut self, f: &fn(&mut Resolver)) {
         self.value_ribs.push(@Rib::new(ConstantItemRibKind));
+        self.type_ribs.push(@Rib::new(ConstantItemRibKind));
         f(self);
+        self.type_ribs.pop();
         self.value_ribs.pop();
     }
 

branches/try2/src/librustuv/uvio.rs

@@ -1653,9 +1653,6 @@ impl RtioFileStream for UvFileStream {
         let self_ = unsafe { cast::transmute::<&UvFileStream, &mut UvFileStream>(self) };
         self_.seek_common(0, SEEK_CUR)
     }
-    fn flush(&mut self) -> Result<(), IoError> {
-        Ok(())
-    }
 }
 
 pub struct UvProcess {

branches/try2/src/libstd/rt/io/buffered.rs

@@ -418,7 +418,6 @@ mod test {
 
         impl rt::io::Writer for S {
             fn write(&mut self, _: &[u8]) {}
-            fn flush(&mut self) {}
         }
 
         impl rt::io::Reader for S {

branches/try2/src/libstd/rt/io/comm_adapters.rs

@@ -32,8 +32,6 @@ impl<C: GenericChan<~[u8]>> ChanWriter<C> {
 
 impl<C: GenericChan<~[u8]>> Writer for ChanWriter<C> {
     fn write(&mut self, _buf: &[u8]) { fail!() }
-
-    fn flush(&mut self) { fail!() }
 }
 
 struct ReaderPort<R>;

branches/try2/src/libstd/rt/io/file.rs

@@ -383,15 +383,6 @@ impl Writer for FileStream {
             }
         }
     }
-
-    fn flush(&mut self) {
-        match self.fd.flush() {
-            Ok(_) => (),
-            Err(ioerr) => {
-                io_error::cond.raise(ioerr);
-            }
-        }
-    }
 }
 
 /// a `std::rt::io:Seek` trait impl for file I/O.

branches/try2/src/libstd/rt/io/mem.rs

@@ -62,8 +62,6 @@ impl Writer for MemWriter {
         // Bump us forward
         self.pos += buf.len();
     }
-
-    fn flush(&mut self) { /* no-op */ }
 }
 
 impl Seek for MemWriter {

branches/try2/src/libstd/rt/io/mock.rs

@@ -32,19 +32,16 @@ impl Reader for MockReader {
 
 pub struct MockWriter {
     priv write: ~fn(buf: &[u8]),
-    priv flush: ~fn()
 }
 
 impl MockWriter {
     pub fn new() -> MockWriter {
         MockWriter {
             write: |_| (),
-            flush: || ()
         }
     }
 }
 
 impl Writer for MockWriter {
     fn write(&mut self, buf: &[u8]) { (self.write)(buf) }
-    fn flush(&mut self) { (self.flush)() }
 }

branches/try2/src/libstd/rt/io/mod.rs

@@ -810,8 +810,12 @@ pub trait Writer {
     /// Raises the `io_error` condition on error
     fn write(&mut self, buf: &[u8]);
 
-    /// Flush output
-    fn flush(&mut self);
+    /// Flush this output stream, ensuring that all intermediately buffered
+    /// contents reach their destination.
+    ///
+    /// This is by default a no-op and implementors of the `Writer` trait should
+    /// decide whether their stream needs to be buffered or not.
+    fn flush(&mut self) {}
 
     /// Write the result of passing n through `int::to_str_bytes`.
     fn write_int(&mut self, n: int) {

branches/try2/src/libstd/rt/io/native/file.rs

@@ -132,8 +132,6 @@ impl Writer for FileDesc {
             raise_error();
         }
     }
-
-    fn flush(&mut self) {}
 }
 
 impl Drop for FileDesc {

branches/try2/src/libstd/rt/io/net/tcp.rs

@@ -84,8 +84,6 @@ impl Writer for TcpStream {
             Err(ioerr) => io_error::cond.raise(ioerr),
         }
     }
-
-    fn flush(&mut self) { /* no-op */ }
 }
 
 pub struct TcpListener {

branches/try2/src/libstd/rt/io/net/udp.rs

@@ -100,8 +100,6 @@ impl Writer for UdpStream {
             sock.sendto(buf, self.connectedTo);
         }
     }
-
-    fn flush(&mut self) { fail!() }
 }
 
 #[cfg(test)]

branches/try2/src/libstd/rt/io/net/unix.rs

@@ -78,7 +78,6 @@ impl Reader for UnixStream {
 
 impl Writer for UnixStream {
     fn write(&mut self, buf: &[u8]) { self.obj.write(buf) }
-    fn flush(&mut self) { self.obj.flush() }
 }
 
 pub struct UnixListener {

branches/try2/src/libstd/rt/io/pipe.rs

@@ -86,6 +86,4 @@ impl Writer for PipeStream {
             }
         }
     }
-
-    fn flush(&mut self) {}
 }

branches/try2/src/libstd/rt/io/stdio.rs

@@ -294,8 +294,6 @@ impl Writer for StdWriter {
             Err(e) => io_error::cond.raise(e)
         }
     }
-
-    fn flush(&mut self) { /* nothing to do */ }
 }
 
 #[cfg(test)]

branches/try2/src/libstd/rt/rtio.rs

@@ -173,7 +173,6 @@ pub trait RtioFileStream {
     fn pwrite(&mut self, buf: &[u8], offset: u64) -> Result<(), IoError>;
     fn seek(&mut self, pos: i64, whence: SeekStyle) -> Result<u64, IoError>;
     fn tell(&self) -> Result<u64, IoError>;
-    fn flush(&mut self) -> Result<(), IoError>;
 }
 
 pub trait RtioProcess {

branches/try2/src/test/compile-fail/inner-static-type-parameter.rs

@@ -0,0 +1,21 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// see #9186
+
+enum Bar<T> { What }
+
+fn foo<T>() {
+    static a: Bar<T> = What;
+    //~^ ERROR: cannot use an outer type parameter in this context
+}
+
+fn main() {
+}