---

yaml
---
r: 64258
b: refs/heads/snap-stage3
c: 2cd9d7b
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

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

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

@@ -18,11 +18,10 @@
 
 use std::cmp;
 use std::container::{Container, Mutable, Map, Set};
-use std::iterator::*;
+use std::iterator::{Iterator,IteratorUtil,ZipIterator,Counter};
 use std::uint;
 use std::util::replace;
 use std::vec::{VecIterator,VecMutIterator,VecRevIterator,VecMutRevIterator};
-use std::vec::VecConsumeIterator;
 
 #[allow(missing_doc)]
 pub struct SmallIntMap<T> {
@@ -205,17 +204,6 @@ impl<V> SmallIntMap<V> {
             iter: Counter::new(self.len() as int - 1, -1).zip(self.v.mut_rev_iter())
         }
     }
-
-    /// Empties the hash map, moving all values into the specified closure
-    pub fn consume(&mut self)
-        -> FilterMapIterator<(uint, Option<V>), (uint, V),
-                EnumerateIterator<Option<V>, VecConsumeIterator<Option<V>>>>
-    {
-        let values = replace(&mut self.v, ~[]);
-        values.consume_iter().enumerate().filter_map(|(i, v)| {
-            v.map_consume(|v| (i, v))
-        })
-    }
 }
 
 impl<V:Copy> SmallIntMap<V> {
@@ -637,21 +625,6 @@ mod tests {
 
         assert!(a.iter().all(|(_,v)| *v == 5 ));
     }
-
-    #[test]
-    fn test_consume() {
-        let mut m = SmallIntMap::new();
-        m.insert(1, ~2);
-        let mut called = false;
-        for m.consume().advance |(k, v)| {
-            assert!(!called);
-            called = true;
-            assert_eq!(k, 1);
-            assert_eq!(v, ~2);
-        }
-        assert!(called);
-        m.insert(2, ~1);
-    }
 }
 
 #[cfg(test)]

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

@@ -741,6 +741,7 @@ fn check_item_ctypes(cx: &Context, it: &ast::item) {
                     _ => ()
                 }
             }
+            ast::ty_ptr(ref mt) => { check_ty(cx, mt.ty) }
             _ => ()
         }
     }

branches/snap-stage3/src/libstd/unstable/global.rs

@@ -28,7 +28,7 @@ avoid hitting the mutex.
 use cast::{transmute};
 use clone::Clone;
 use kinds::Send;
-use libc::{c_void};
+use libc::{c_void, intptr_t};
 use option::{Option, Some, None};
 use ops::Drop;
 use unstable::sync::{Exclusive, exclusive};
@@ -228,7 +228,7 @@ fn key_ptr<T:Send>(key: GlobalDataKey<T>) -> uint {
 }
 
 extern {
-    fn rust_get_global_data_ptr() -> *mut int;
+    fn rust_get_global_data_ptr() -> *mut intptr_t;
 }
 
 #[test]

branches/snap-stage3/src/rt/rust_builtin.cpp

@@ -774,7 +774,7 @@ rust_register_exit_function(spawn_fn runner, fn_env_pair *f) {
     task->kernel->register_exit_function(runner, f);
 }
 
-extern "C" void *
+extern "C" intptr_t*
 rust_get_global_data_ptr() {
     rust_task *task = rust_get_current_task();
     return &task->kernel->global_data;

branches/snap-stage3/src/rt/rust_kernel.h

@@ -124,7 +124,7 @@ class rust_kernel {
 
 public:
     struct rust_env *env;
-    uintptr_t global_data;
+    intptr_t global_data;
 
     rust_kernel(rust_env *env);
 

branches/snap-stage3/src/test/compile-fail/warn-ctypes-err-attr.rs renamed to branches/snap-stage3/src/test/compile-fail/lint-ctypes.rs

@@ -8,14 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:found rust type
 #[deny(ctypes)];
 
-mod libc {
-    #[nolink]
-    pub extern {
-        pub fn malloc(size: int) -> *u8;
-    }
+use std::libc;
+
+#[nolink]
+extern {
+    pub fn bare_type1(size: int); //~ ERROR: found rust type
+    pub fn bare_type2(size: uint); //~ ERROR: found rust type
+    pub fn ptr_type1(size: *int); //~ ERROR: found rust type
+    pub fn ptr_type2(size: *uint); //~ ERROR: found rust type
+
+    pub fn good1(size: *libc::c_int);
+    pub fn good2(size: *libc::c_uint);
 }
 
 fn main() {