fix: update dependencies

fix: cargo fmt
edrevo · Feb 20, 2022 · b78595f · b78595f
1 parent 90dc08d
commit b78595f
Show file tree

Hide file tree

Showing 8 changed files with 417 additions and 665 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/buildkit-llb/Cargo.toml b/buildkit-llb/Cargo.toml
@@ -13,14 +13,14 @@ categories = ["development-tools::build-utils", "api-bindings"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
-either = "1.6"
-failure = "0.1"
-lazy_static = "1"
-log = "0.4"
-prost = "0.6"
-regex = "1"
-serde_json = "1.0"
-sha2 = "0.8"
+either = "1.6.1"
+failure = "0.1.8"
+lazy_static = "1.4.0"
+log = "0.4.14"
+prost = "0.9.0"
+regex = "1.5.4"
+serde_json = "1.0.79"
+sha2 = "0.10.2"
 
 [dependencies.buildkit-proto]
 version = "0.2"

diff --git a/buildkit-llb/src/lib.rs b/buildkit-llb/src/lib.rs
@@ -1,5 +1,6 @@
 #![deny(warnings)]
 #![deny(clippy::all)]
+#![allow(dead_code)]
 
 // FIXME: get rid of the unwraps
 // TODO: implement warnings for op hash collisions (will incredibly help to debug problems).

diff --git a/buildkit-llb/src/serialization/output.rs b/buildkit-llb/src/serialization/output.rs
@@ -23,8 +23,8 @@ impl Node {
 
     pub fn get_digest(bytes: &[u8]) -> String {
         let mut hasher = Sha256::new();
-        hasher.input(&bytes);
+        hasher.update(&bytes);
 
-        format!("sha256:{:x}", hasher.result())
+        format!("sha256:{:x}", hasher.finalize())
     }
 }
diff --git a/buildkit-proto/Cargo.toml b/buildkit-proto/Cargo.toml
@@ -13,12 +13,9 @@ categories = ["development-tools::build-utils", "api-bindings"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
-prost = "0.6"
-prost-types = "0.6"
-tonic = { git = "https://github.com/edrevo/tonic", branch = "unimplemented-content-type" }
+prost = "0.9.0"
+prost-types = "0.9.0"
+tonic = "0.6.0"
 
-[build-dependencies.tonic-build]
-git = "https://github.com/edrevo/tonic"
-branch = "unimplemented-content-type"
-default-features = false
-features = ["prost", "transport"]
+[build-dependencies]
+tonic-build = { version = "0.6.2", features = ["prost", "transport"] }
diff --git a/dockerfile-plus/Cargo.toml b/dockerfile-plus/Cargo.toml
@@ -5,23 +5,23 @@ authors = ["Ximo Guanter <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-anyhow = "1"
-async-trait = "0.1"
-crossbeam = "0.7"
-either = "1"
-env_logger = "0.8"
-futures = "0.3"
-libc = "0.2"
-mio = "0.6"
-pin-project = "1"
-prost = "0.6"
-prost-types = "0.6"
-regex = "1.3"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1"
-tokio = { version = "0.2", features = ["macros", "rt-core", "rt-threaded"] }
-tonic = { git = "https://github.com/edrevo/tonic", branch = "unimplemented-content-type" }
-tower = "0.3"
-url = "2.2"
+anyhow = "1.0.54"
+async-trait = "0.1.52"
+crossbeam = "0.8.1"
+either = "1.6.1"
+env_logger = "0.9.0"
+futures = "0.3.21"
+libc = "0.2.119"
+mio = "0.8.0"
+pin-project = "1.0.10"
+prost = "0.9.0"
+prost-types = "0.9.0"
+regex = "1.5.4"
+serde = { version = "1.0.136", features = ["derive"] }
+serde_json = "1.0.79"
+tokio = { version = "1.17.0", features = ["macros", "rt", "rt-multi-thread"] }
+tonic = "0.6.0"
+tower = "0.4.12"
+url = "2.2.2"
 buildkit-llb = { version = "0.2", path = "../buildkit-llb" }
 buildkit-proto = { version = "0.2", path = "../buildkit-proto" }
diff --git a/dockerfile-plus/src/dockerfile_frontend.rs b/dockerfile-plus/src/dockerfile_frontend.rs
@@ -5,7 +5,7 @@ use anyhow::Result;
 use buildkit_proto::moby::buildkit::v1::frontend::{
     self, llb_bridge_client::LlbBridgeClient, llb_bridge_server::LlbBridge,
 };
-use crossbeam::{channel, Sender};
+use crossbeam::{channel, channel::Sender};
 use frontend::{llb_bridge_server::LlbBridgeServer, ReadFileResponse};
 use tokio::sync::RwLock;
 use tonic::{transport::Channel, transport::Server, Request, Response};
@@ -38,7 +38,7 @@ impl DockerfileFrontend {
                 self.dockerfile_name.clone(),
                 dockerfile_contents.as_bytes().to_vec(),
             )))
-            .serve_with_incoming(tokio::stream::once(StdioSocket::try_new_rw(
+            .serve_with_incoming(tokio_stream::once(StdioSocket::try_new_rw(
                 dockerfile_front.stdout.take().unwrap(),
                 dockerfile_front.stdin.take().unwrap(),
             )))

diff --git a/dockerfile-plus/src/main.rs b/dockerfile-plus/src/main.rs
@@ -117,17 +117,17 @@ async fn dockerfile_trap(
     let context_layer = solve(&mut client, Terminal::with(context_source.output())).await?;
 
     fn replace(
-        l   : &    String,
-        r   : &mut Vec<String>,
-        c   : &mut LlbBridgeClient<Channel>,
-        ctx : &    String
-    )  -> Result<()> {
+        l: &String,
+        r: &mut Vec<String>,
+        c: &mut LlbBridgeClient<Channel>,
+        ctx: &String,
+    ) -> Result<()> {
         if let Some(file_path) = l.trim().strip_prefix(INCLUDE_COMMAND) {
             let bytes = executor::block_on(read_file(c, &ctx, file_path.trim_start().to_string(), None))
                 .with_context(|| format!("Could not read file \"{}\". Remember that the file path is relative to the build context, not the Dockerfile path.", file_path))?;
             //recurse
             for l2 in std::str::from_utf8(&bytes)?.to_string().lines() {
-                replace(&l2.to_string(), r, c, &ctx)? ;
+                replace(&l2.to_string(), r, c, &ctx)?;
             }
         } else {
             r.push(l.to_string());
@@ -136,7 +136,7 @@ async fn dockerfile_trap(
     }
 
     for line in dockerfile_contents.lines() {
-        replace(&line.to_string(), &mut result, &mut client, &context_layer)? ;
+        replace(&line.to_string(), &mut result, &mut client, &context_layer)?;
     }
     let dockerfile_contents = result.join("\n");
     dockerfile_frontend.solve(&dockerfile_contents).await