Fix all third party libraries

third_party/cfg-if/Cargo.toml

@@ -11,7 +11,4 @@ description = """
 A macro to ergonomically define an item depending on a large number of #[cfg]
 parameters. Structured like an if-else chain, the first matching branch is the
 item that gets emitted.
-"""
-
-[badges]
-travis-ci = { repository = "alexcrichton/cfg-if" }
+"""

third_party/cfg-if/README.md

@@ -36,17 +36,9 @@ fn main() {
 
 # License
 
-This project is licensed under either of
+`cfg-if` is primarily distributed under the terms of both the MIT license and
+the Apache License (Version 2.0), with portions covered by various BSD-like
+licenses.
 
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
+See LICENSE-APACHE, and LICENSE-MIT for details.
 
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
-dual licensed as above, without any additional terms or conditions.

third_party/log/Cargo.toml

@@ -47,7 +47,7 @@ appveyor = { repository = "alexcrichton/log" }
 sgx_tstd = { path =  "../../sgx_tstd" }
 
 [dependencies]
-cfg-if = { path = "../cfg-if" }
+cfg-if = { version = "0.1.2", path = "../cfg-if" }
 serde = { version = "1.0", optional = true, default-features = false, path = "../serde-rs/serde/serde" }
 
 [dev-dependencies]

third_party/matrixmultiply/Cargo.toml

@@ -25,7 +25,7 @@ harness = false
 sgx_tstd = { path =  "../../sgx_tstd" }
 
 [dependencies]
-rawpointer = { path = "../rawpointer" }
+rawpointer = { version = "0.1", path = "../rawpointer" }
 
 [dev-dependencies]
 bencher = "0.1.2"

third_party/ring/Cargo.toml

@@ -281,7 +281,7 @@ sgx_tstd = { path = "../../sgx_tstd" }
 sgx_rand = { path = "../../sgx_rand" }
 
 [dependencies]
-untrusted = { path = "../untrusted" }
+untrusted = { version = "0.6", path = "../untrusted" }
 
 [target.'cfg(any(target_os = "redox", all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies]
 lazy_static = { path = "../lazy-static.rs" }

third_party/rust-csv/csv-core/src/lib.rs

@@ -98,8 +98,8 @@ foo,\"bar,baz\"
 
 #![deny(missing_docs)]
 #![no_std]
-
 #![cfg_attr(target_env = "sgx", feature(rustc_private))]
+
 #[cfg(test)]
 extern crate arrayvec;
 extern crate sgx_trts;

third_party/rust-csv/csv-index/src/lib.rs

@@ -80,6 +80,12 @@ amenable to serializing to disk.)
 */
 
 #![deny(missing_docs)]
+#![cfg_attr(not(target_env = "sgx"), no_std)]
+#![cfg_attr(target_env = "sgx", feature(rustc_private))]
+
+#[cfg(not(target_env = "sgx"))]
+#[macro_use(format)]
+extern crate sgx_tstd as std;
 
 extern crate byteorder;
 extern crate csv;

third_party/rustls/Cargo.toml

@@ -13,7 +13,7 @@ categories = ["network-programming", "cryptography"]
 sgx_tstd = { path =  "../../sgx_tstd" }
 
 [dependencies]
-untrusted = { path = "../untrusted" }
+untrusted = { version = "0.6", path = "../untrusted" }
 base64 = { path = "../rust-base64" }
 log = { path = "../log" , optional = true }
 ring = { path = "../ring" , version="0.12.1", features = ["rsa_signing"] }

third_party/sct/Cargo.toml

@@ -14,4 +14,4 @@ sgx_tstd = { path =  "../../sgx_tstd" }
 
 [dependencies]
 ring = { version = "0.12", path = "../ring" }
-untrusted = { path = "../untrusted" }
+untrusted = { version = "0.6", path = "../untrusted" }

third_party/untrusted/Cargo.toml

@@ -2,15 +2,14 @@
 authors = ["Brian Smith <[email protected]>"]
 description = "Safe, fast, zero-panic, zero-crashing, zero-allocation parsing of untrusted inputs in Rust."
 documentation = "https://briansmith.org/rustdoc/untrusted/"
-license = "ISC"
+license-file = "LICENSE.txt"
 name = "untrusted"
 readme = "README.md"
 repository = "https://github.com/briansmith/untrusted"
-version = "0.6.1"
+version = "0.6.0"
 
 [lib]
 name = "untrusted"
-path = "src/untrusted.rs"
 
 [profile.bench]
 opt-level = 3

third_party/untrusted/src/untrusted.rs

@@ -141,7 +141,7 @@ impl<'a> Input<'a> {
     /// Returns an iterator over the input.
     #[inline]
     pub fn iter(&self) -> <&[u8] as IntoIterator>::IntoIter {
-        self.value.iter()
+        self.value.into_iter()
     }
 
     /// Returns the length of the `Input`.
@@ -207,11 +207,11 @@ impl <'a, 'b> PartialEq<&'b [u8]> for Input<'a> {
 /// Calls `read` with the given input as a `Reader`, ensuring that `read`
 /// consumed the entire input. When `input` is `None`, `read` will be
 /// called with `None`.
-pub fn read_all_optional<F, R, E>(input: Option<Input>,
-                                  incomplete_read: E, read: F)
-                                  -> Result<R, E>
-                                  where F: FnOnce(Option<&mut Reader>)
-                                                  -> Result<R, E> {
+pub fn read_all_optional<'a, F, R, E>(input: Option<Input<'a>>,
+                                      incomplete_read: E, read: F)
+                                      -> Result<R, E>
+                                      where F: FnOnce(Option<&mut Reader>)
+                                                      -> Result<R, E> {
     match input {
         Some(input) => {
             let mut input = Reader::new(input);
@@ -283,7 +283,7 @@ impl<'a> Reader<'a> {
     /// byte is equal to `b`, and false otherwise.
     pub fn peek(&self, b: u8) -> bool {
         match self.input.get(self.i) {
-            Some(actual_b) => b == *actual_b,
+            Some(actual_b) => return b == *actual_b,
             None => false
         }
     }
@@ -367,7 +367,7 @@ mod no_panic {
         }
 
         #[inline]
-        pub fn iter(&self) -> <&'a [u8] as IntoIterator>::IntoIter {
+        pub fn into_iter(&self) -> <&'a [u8] as IntoIterator>::IntoIter {
             self.bytes.into_iter()
         }
 
@@ -436,15 +436,4 @@ mod tests {
         let input = Input::from(slice);
         assert_eq!(input.as_slice_less_safe(), slice);
     }
-
-    #[test]
-    fn test_input_as_iterator() {
-        let slice = b"foo";
-        let input = Input::from(slice);
-        let mut iter = input.iter();
-        assert_eq!(Some(&b'f'), iter.next());
-        assert_eq!(Some(&b'o'), iter.next());
-        assert_eq!(Some(&b'o'), iter.next());
-        assert_eq!(None, iter.next());
-    }
 }

third_party/webpki/Cargo.toml

@@ -67,7 +67,7 @@ sgx_tstd = { path =  "../../sgx_tstd" }
 
 [dependencies]
 ring = { path = "../ring" }
-untrusted = { path = "../untrusted" }
+untrusted = { version = "0.6", path = "../untrusted" }
 
 [dev-dependencies]
 base64 = { path = "../rust-base64" }