Inline values coming from the cloudabi package.

Cargo.lock

@@ -8,24 +8,11 @@ name = "bitflags"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "bitflags"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "cc"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "cloudabi"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "ctest"
 version = "0.1.6"
@@ -89,9 +76,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libc"
 version = "0.2.34"
-dependencies = [
- "cloudabi 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "libc-test"
@@ -272,9 +256,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [metadata]
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
-"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
 "checksum cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a9b13a57efd6b30ecd6598ebdb302cca617930b5470647570468a65d12ef9719"
-"checksum cloudabi 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91833d57fabae4915bc772175e83f4830805b9e3b26c1c1fc85e4fd2339963cb"
 "checksum ctest 0.1.6 (git+https://github.com/alexcrichton/ctest)" = "<none>"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "checksum extprim 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1de79797db68eb235c616cc3ad1a2793fa94a2245594cb6f81d602e62ed951c5"

Cargo.toml

@@ -17,9 +17,6 @@ other common platform libraries.
 travis-ci = { repository = "rust-lang/libc" }
 appveyor = { repository = "rust-lang/libc", project_name = "rust-lang-libs/libc" }
 
-[target.'cfg(target_os = "cloudabi")'.dependencies]
-cloudabi = "0.0.1"
-
 [features]
 default = ["use_std"]
 use_std = []

src/cloudabi/mod.rs

-extern crate cloudabi;
-
 pub type in_addr_t = u32;
 pub type in_port_t = u16;
 pub type pthread_key_t = usize;
@@ -101,29 +99,29 @@ pub const _SC_PAGESIZE: ::c_int = 54;
 pub const AF_INET: ::c_int = 1;
 pub const AF_INET6: ::c_int = 2;
 
-pub const EACCES: ::c_int = cloudabi::errno::ACCES as ::c_int;
-pub const EADDRINUSE: ::c_int = cloudabi::errno::ADDRINUSE as ::c_int;
-pub const EADDRNOTAVAIL: ::c_int = cloudabi::errno::ADDRNOTAVAIL as ::c_int;
-pub const EAGAIN: ::c_int = cloudabi::errno::AGAIN as ::c_int;
-pub const ECONNABORTED: ::c_int = cloudabi::errno::CONNABORTED as ::c_int;
-pub const ECONNREFUSED: ::c_int = cloudabi::errno::CONNREFUSED as ::c_int;
-pub const ECONNRESET: ::c_int = cloudabi::errno::CONNRESET as ::c_int;
-pub const EEXIST: ::c_int = cloudabi::errno::EXIST as ::c_int;
-pub const EINTR: ::c_int = cloudabi::errno::INTR as ::c_int;
-pub const EINVAL: ::c_int = cloudabi::errno::INVAL as ::c_int;
-pub const ENOENT: ::c_int = cloudabi::errno::NOENT as ::c_int;
-pub const ENOTCONN: ::c_int = cloudabi::errno::NOTCONN as ::c_int;
-pub const EPERM: ::c_int = cloudabi::errno::PERM as ::c_int;
-pub const EPIPE: ::c_int = cloudabi::errno::PIPE as ::c_int;
-pub const ETIMEDOUT: ::c_int = cloudabi::errno::TIMEDOUT as ::c_int;
-pub const EWOULDBLOCK: ::c_int = cloudabi::errno::AGAIN as ::c_int;
+pub const EACCES: ::c_int = 2;
+pub const EADDRINUSE: ::c_int = 3;
+pub const EADDRNOTAVAIL: ::c_int = 4;
+pub const EAGAIN: ::c_int = 6;
+pub const ECONNABORTED: ::c_int = 13;
+pub const ECONNREFUSED: ::c_int = 14;
+pub const ECONNRESET: ::c_int = 15;
+pub const EEXIST: ::c_int = 20;
+pub const EINTR: ::c_int = 27;
+pub const EINVAL: ::c_int = 28;
+pub const ENOENT: ::c_int = 44;
+pub const ENOTCONN: ::c_int = 53;
+pub const EPERM: ::c_int = 63;
+pub const EPIPE: ::c_int = 64;
+pub const ETIMEDOUT: ::c_int = 73;
+pub const EWOULDBLOCK: ::c_int = EAGAIN;
 
 pub const EAI_SYSTEM: ::c_int = 9;
 
 pub const PTHREAD_STACK_MIN: ::size_t = 1024;
 
-pub const SOCK_DGRAM: ::c_int = cloudabi::filetype::SOCKET_DGRAM as ::c_int;
-pub const SOCK_STREAM: ::c_int = cloudabi::filetype::SOCKET_STREAM as ::c_int;
+pub const SOCK_DGRAM: ::c_int = 128;
+pub const SOCK_STREAM: ::c_int = 130;
 
 cfg_if! {
     if #[cfg(target_arch = "aarch64")] {