Skip to content

Commit

Permalink
Updates cargo packages
Browse files Browse the repository at this point in the history 
Some minor upgrades to use more recent dependencies.
  • Loading branch information
@allada
allada committed Oct 16, 2022
1 parent 41028a9 commit a610e69
Show file tree
Hide file tree
Showing 161 changed files with 1,678 additions and 1,562 deletions.
482 changes: 250 additions & 232 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Expand Up @@ -40,7 +40,7 @@ byteorder = "1.4.3"
lazy_static = "1.4.0"
filetime = "0.2.15"
nix = "0.23.1"
clap = { version = "3.1.8", features = ["derive"] }
clap = { version = "4.0.9", features = ["derive"] }
uuid = { version = "0.8.2", features = ["v4"] }
shlex = "1.1.0"
relative-path = "1.7.0"
Expand Down
5 changes: 2 additions & 3 deletions WORKSPACE
View file
Expand Up @@ -6,10 +6,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "rules_rust",
sha256 = "7fb9b4fe1a6fb4341bdf7c623e619460ecc0f52d5061cc56abc750111fba8a87",
sha256 = "0cc7e6b39e492710b819e00d48f2210ae626b717a3ab96e048c43ab57e61d204",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_rust/releases/download/0.7.0/rules_rust-v0.7.0.tar.gz",
"https://github.com/bazelbuild/rules_rust/releases/download/0.7.0/rules_rust-v0.7.0.tar.gz",
"https://github.com/bazelbuild/rules_rust/releases/download/0.10.0/rules_rust-v0.10.0.tar.gz",
],
)

Expand Down
6 changes: 3 additions & 3 deletions cas/grpc_service/cas_server.rs
View file
Expand Up @@ -70,7 +70,7 @@ impl CasServer {
for digest in inner_request.blob_digests.into_iter() {
let digest: DigestInfo = digest.try_into()?;
let store_clone = store.clone();
futures.push(tokio::spawn(async move {
futures.push_back(tokio::spawn(async move {
let store = Pin::new(store_clone.as_ref());
store.has(digest.clone()).await.map_or_else(
|e| {
Expand Down Expand Up @@ -129,7 +129,7 @@ impl CasServer {
let digest: DigestInfo = request.digest.err_tip(|| "Digest not found in request")?.try_into()?;
let digest_copy = digest.clone();
let request_data = request.data;
futures.push(tokio::spawn(
futures.push_back(tokio::spawn(
async move {
let size_bytes = usize::try_from(digest_copy.size_bytes)
.err_tip(|| "Digest size_bytes was not convertible to usize")?;
Expand Down Expand Up @@ -183,7 +183,7 @@ impl CasServer {
let digest_copy = digest.clone();
let store_clone = store.clone();

futures.push(tokio::spawn(
futures.push_back(tokio::spawn(
async move {
let size_bytes = usize::try_from(digest_copy.size_bytes)
.err_tip(|| "Digest size_bytes was not convertible to usize")?;
Expand Down
10 changes: 4 additions & 6 deletions proto/gen_protos_tool.rs
View file
@@ -1,4 +1,4 @@
use clap::{Arg, Command};
use clap::{Arg, ArgAction, Command};
use prost_build::Config;
use std::path::PathBuf;
use std::vec::Vec;
Expand All @@ -12,21 +12,19 @@ fn main() -> std::io::Result<()> {
.short('i')
.long("input")
.required(true)
.multiple_occurrences(true)
.takes_value(true)
.action(ArgAction::Append)
.help("Input proto file"),
)
.arg(
Arg::new("output_dir")
.short('o')
.required(true)
.long("output_dir")
.takes_value(true)
.help("Output directory"),
)
.get_matches();
let paths = matches.values_of("input").unwrap().collect::<Vec<&str>>();
let output_dir = PathBuf::from(matches.value_of("output_dir").unwrap());
let paths = matches.get_many::<String>("input").unwrap().collect::<Vec<&String>>();
let output_dir = PathBuf::from(matches.get_one::<String>("output_dir").unwrap());

let mut config = Config::new();
config.bytes(&["."]);
Expand Down
24 changes: 12 additions & 12 deletions third_party/BUILD.bazel
View file
Expand Up @@ -14,7 +14,7 @@ licenses([
# Aliased targets
alias(
name = "async_trait",
actual = "@raze__async_trait__0_1_56//:async_trait",
actual = "@raze__async_trait__0_1_57//:async_trait",
tags = [
"cargo-raze",
"manual",
Expand All @@ -41,7 +41,7 @@ alias(

alias(
name = "bytes",
actual = "@raze__bytes__1_2_0//:bytes",
actual = "@raze__bytes__1_2_1//:bytes",
tags = [
"cargo-raze",
"manual",
Expand All @@ -50,7 +50,7 @@ alias(

alias(
name = "clap",
actual = "@raze__clap__3_2_14//:clap",
actual = "@raze__clap__4_0_9//:clap",
tags = [
"cargo-raze",
"manual",
Expand All @@ -59,7 +59,7 @@ alias(

alias(
name = "ctor",
actual = "@raze__ctor__0_1_22//:ctor",
actual = "@raze__ctor__0_1_23//:ctor",
tags = [
"cargo-raze",
"manual",
Expand All @@ -68,7 +68,7 @@ alias(

alias(
name = "env_logger",
actual = "@raze__env_logger__0_9_0//:env_logger",
actual = "@raze__env_logger__0_9_1//:env_logger",
tags = [
"cargo-raze",
"manual",
Expand Down Expand Up @@ -104,7 +104,7 @@ alias(

alias(
name = "futures",
actual = "@raze__futures__0_3_21//:futures",
actual = "@raze__futures__0_3_24//:futures",
tags = [
"cargo-raze",
"manual",
Expand Down Expand Up @@ -149,7 +149,7 @@ alias(

alias(
name = "lazy_init",
actual = "@raze__lazy_init__0_5_0//:lazy_init",
actual = "@raze__lazy_init__0_5_1//:lazy_init",
tags = [
"cargo-raze",
"manual",
Expand Down Expand Up @@ -185,7 +185,7 @@ alias(

alias(
name = "lz4_flex",
actual = "@raze__lz4_flex__0_9_2//:lz4_flex",
actual = "@raze__lz4_flex__0_9_5//:lz4_flex",
tags = [
"cargo-raze",
"manual",
Expand Down Expand Up @@ -320,7 +320,7 @@ alias(

alias(
name = "serde",
actual = "@raze__serde__1_0_140//:serde",
actual = "@raze__serde__1_0_145//:serde",
tags = [
"cargo-raze",
"manual",
Expand All @@ -338,7 +338,7 @@ alias(

alias(
name = "shellexpand",
actual = "@raze__shellexpand__2_1_0//:shellexpand",
actual = "@raze__shellexpand__2_1_2//:shellexpand",
tags = [
"cargo-raze",
"manual",
Expand All @@ -365,7 +365,7 @@ alias(

alias(
name = "tokio",
actual = "@raze__tokio__1_20_0//:tokio",
actual = "@raze__tokio__1_21_2//:tokio",
tags = [
"cargo-raze",
"manual",
Expand All @@ -374,7 +374,7 @@ alias(

alias(
name = "tokio_stream",
actual = "@raze__tokio_stream__0_1_9//:tokio_stream",
actual = "@raze__tokio_stream__0_1_10//:tokio_stream",
tags = [
"cargo-raze",
"manual",
Expand Down

0 comments on commit a610e69

Please sign in to comment.