---

yaml
---
r: 112446
b: refs/heads/try
c: 67ee480
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: a72a6ec897e1b8d7e125be9bb4b60d89c79aa4c0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b5dd3f05fe95168b5569d0f519636149479eb6ac
-refs/heads/try: 07598fc8cc7049594afee14528bda4019d8dda14
+refs/heads/try: 67ee480936947aa5b1953b7b6e48a0c7a191501e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libnative/io/pipe_unix.rs

@@ -155,77 +155,6 @@ impl rtio::RtioPipe for UnixStream {
     }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Unix Datagram
-////////////////////////////////////////////////////////////////////////////////
-
-pub struct UnixDatagram {
-    inner: UnsafeArc<Inner>,
-}
-
-impl UnixDatagram {
-    pub fn connect(addr: &CString) -> IoResult<UnixDatagram> {
-        connect(addr, libc::SOCK_DGRAM).map(|inner| {
-            UnixDatagram { inner: UnsafeArc::new(inner) }
-        })
-    }
-
-    pub fn bind(addr: &CString) -> IoResult<UnixDatagram> {
-        bind(addr, libc::SOCK_DGRAM).map(|inner| {
-            UnixDatagram { inner: UnsafeArc::new(inner) }
-        })
-    }
-
-    fn fd(&self) -> fd_t { unsafe { (*self.inner.get()).fd } }
-
-    pub fn recvfrom(&mut self, buf: &mut [u8]) -> IoResult<(uint, CString)> {
-        let mut storage: libc::sockaddr_storage = unsafe { intrinsics::init() };
-        let storagep = &mut storage as *mut libc::sockaddr_storage;
-        let mut addrlen: libc::socklen_t =
-                mem::size_of::<libc::sockaddr_storage>() as libc::socklen_t;
-        let ret = retry(|| unsafe {
-            libc::recvfrom(self.fd(),
-                           buf.as_ptr() as *mut libc::c_void,
-                           buf.len() as libc::size_t,
-                           0,
-                           storagep as *mut libc::sockaddr,
-                           &mut addrlen) as libc::c_int
-        });
-        if ret < 0 { return Err(super::last_error()) }
-        sockaddr_to_unix(&storage, addrlen as uint).and_then(|addr| {
-            Ok((ret as uint, addr))
-        })
-    }
-
-    pub fn sendto(&mut self, buf: &[u8], dst: &CString) -> IoResult<()> {
-        let (dst, len) = try!(addr_to_sockaddr_un(dst));
-        let dstp = &dst as *libc::sockaddr_storage;
-        let ret = retry(|| unsafe {
-            libc::sendto(self.fd(),
-                         buf.as_ptr() as *libc::c_void,
-                         buf.len() as libc::size_t,
-                         0,
-                         dstp as *libc::sockaddr,
-                         len as libc::socklen_t) as libc::c_int
-        });
-        match ret {
-            -1 => Err(super::last_error()),
-            n if n as uint != buf.len() => {
-                Err(io::IoError {
-                    kind: io::OtherIoError,
-                    desc: "couldn't send entire packet at once",
-                    detail: None,
-                })
-            }
-            _ => Ok(())
-        }
-    }
-
-    pub fn clone(&mut self) -> UnixDatagram {
-        UnixDatagram { inner: self.inner.clone() }
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Unix Listener
 ////////////////////////////////////////////////////////////////////////////////

branches/try/src/librustc/middle/lint.rs

@@ -1638,9 +1638,6 @@ impl<'a> Visitor<()> for Context<'a> {
     fn visit_view_item(&mut self, i: &ast::ViewItem, _: ()) {
         self.with_lint_attrs(i.attrs.as_slice(), |cx| {
             check_attrs_usage(cx, i.attrs.as_slice());
-
-            cx.visit_ids(|v| v.visit_view_item(i, ()));
-
             visit::walk_view_item(cx, i, ());
         })
     }

branches/try/src/libstd/lib.rs

@@ -57,6 +57,8 @@
 // Don't link to std. We are std.
 #![no_std]
 
+// NOTE: remove after snapshot
+#![allow(unknown_features)]
 #![deny(missing_doc)]
 
 // When testing libstd, bring in libuv as the I/O backend so tests can print

branches/try/src/libsyntax/ast_util.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -396,13 +396,6 @@ impl<'a, O: IdVisitingOperation> Visitor<()> for IdVisitor<'a, O> {
     }
 
     fn visit_view_item(&mut self, view_item: &ViewItem, env: ()) {
-        if !self.pass_through_items {
-            if self.visited_outermost {
-                return;
-            } else {
-                self.visited_outermost = true;
-            }
-        }
         match view_item.node {
             ViewItemExternCrate(_, _, node_id) => {
                 self.operation.visit_id(node_id)
@@ -424,8 +417,7 @@ impl<'a, O: IdVisitingOperation> Visitor<()> for IdVisitor<'a, O> {
                 }
             }
         }
-        visit::walk_view_item(self, view_item, env);
-        self.visited_outermost = false;
+        visit::walk_view_item(self, view_item, env)
     }
 
     fn visit_foreign_item(&mut self, foreign_item: &ForeignItem, env: ()) {

branches/try/src/snapshots.txt

@@ -1,11 +1,3 @@
-S 2014-04-23 b5dd3f0
-  freebsd-x86_64 b6ccb045b9bea4cc4781bc128e047a1c68dc2c17
-  linux-i386 9e4e8d2bc70ff5b8db21169f762cb20c4dba6c2c
-  linux-x86_64 3367b8e1a0295c8124c26c5c627343ebe9a0ac5d
-  macos-i386 3029be6d6cc7a34b8a03a0a659b427c2916a8962
-  macos-x86_64 2de6d89ac8063588a37059140a602f028f2cc2ea
-  winnt-i386 021b39bc24b293f166aa329224f08cc5dedd5769
-
 S 2014-04-15 349d66a
   freebsd-x86_64 0e8078e24b3f86481c5ae0a47a15e5ed2703f241
   linux-i386 b4e5d104fc2b1eb0236b662ab3cbbb729f789bd6