---

yaml
---
r: 107208
b: refs/heads/try
c: 9706372
h: refs/heads/master
v: v3

Author: emberian

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
-refs/heads/try: 8959aded2c5158792f03474d33f13e44266e4db7
+refs/heads/try: 97063727d791fc75c4704e5838a1b7513691031f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/liblibc/lib.rs

@@ -997,7 +997,6 @@ pub mod types {
             pub mod bsd44 {
             }
             pub mod extra {
-                use ptr;
                 use consts::os::extra::{MAX_PROTOCOL_CHAIN,
                                               WSAPROTOCOL_LEN};
                 use types::common::c95::c_void;

branches/try/src/librustdoc/flock.rs

@@ -18,13 +18,14 @@
 
 pub use self::imp::Lock;
 
+
 #[cfg(unix)]
 mod imp {
-    use std::libc;
+    use libc;
 
     #[cfg(target_os = "linux")]
     mod os {
-        use std::libc;
+        use libc;
 
         pub struct flock {
             l_type: libc::c_short,
@@ -45,7 +46,7 @@ mod imp {
 
     #[cfg(target_os = "freebsd")]
     mod os {
-        use std::libc;
+        use libc;
 
         pub struct flock {
             l_start: libc::off_t,
@@ -64,7 +65,7 @@ mod imp {
 
     #[cfg(target_os = "macos")]
     mod os {
-        use std::libc;
+        use libc;
 
         pub struct flock {
             l_start: libc::off_t,
@@ -132,7 +133,7 @@ mod imp {
 
 #[cfg(windows)]
 mod imp {
-    use std::libc;
+    use libc;
     use std::mem;
     use std::os::win32::as_utf16_p;
     use std::os;

branches/try/src/librustdoc/html/markdown.rs

@@ -26,8 +26,7 @@
 
 #[allow(non_camel_case_types)];
 
-extern crate libc;
-
+use libc;
 use std::cast;
 use std::fmt;
 use std::io;

branches/try/src/librustdoc/lib.rs

@@ -26,6 +26,7 @@ extern crate testing = "test";
 extern crate time;
 #[phase(syntax, link)]
 extern crate log;
+extern crate libc;
 
 use std::local_data;
 use std::io;

branches/try/src/test/run-pass/tcp-stress.rs

@@ -16,8 +16,8 @@
 #[feature(phase)];
 #[phase(syntax, link)]
 extern crate log;
+extern crate libc;
 
-use std::libc;
 use std::io::net::ip::{Ipv4Addr, SocketAddr};
 use std::io::net::tcp::{TcpListener, TcpStream};
 use std::io::{Acceptor, Listener};