Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rust dependencies #1196

Merged
merged 5 commits into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
979 changes: 607 additions & 372 deletions sources/Cargo.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion sources/api/apiclient/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ build = "build.rs"
exclude = ["README.md"]

[dependencies]
futures = "0.3"
http = "0.2"
hyper = { version = "0.13", default-features = false }
hyper-unix-connector = "0.1"
Expand Down
7 changes: 3 additions & 4 deletions sources/api/apiserver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@ build = "build.rs"
exclude = ["README.md"]

[dependencies]
actix-rt = "1.0.0"
actix-web = { version = "2.0.0", default-features = false }
actix-web = { version = "3.2.0", default-features = false }
bottlerocket-release = { path = "../../bottlerocket-release" }
fs2 = "0.4.3"
futures = { version = "0.3", default-features = false }
http = "0.2.1"
libc = "0.2"
log = "0.4"
models = { path = "../../models" }
nix = "0.18.0"
nix = "0.19.0"
num = "0.3.0"
percent-encoding = "2.1"
semver = "0.10"
semver = "0.11"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
simplelog = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion sources/api/apiserver/src/bin/apiserver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ async fn run() -> Result<()> {
// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
// https://github.com/shepmaster/snafu/issues/110
#[actix_rt::main]
#[actix_web::main]
async fn main() {
if let Err(e) = run().await {
eprintln!("{}", e);
Expand Down
6 changes: 3 additions & 3 deletions sources/api/migration/migrator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ exclude = ["README.md"]
bottlerocket-release = { path = "../../../bottlerocket-release" }
log = "0.4"
lz4 = "1.23.1"
nix = "0.18"
pentacle = "0.2.0"
nix = "0.19"
pentacle = "1.0.0"
rand = { version = "0.7", default-features = false, features = ["std"] }
regex = "1.1"
semver = "0.10"
semver = "0.11"
simplelog = "0.8"
snafu = "0.6"
tempfile = "3.1.0"
Expand Down
2 changes: 1 addition & 1 deletion sources/api/schnauzer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exclude = ["README.md"]

[dependencies]
apiclient = { path = "../apiclient" }
base64 = "0.12"
base64 = "0.13"
bottlerocket-release = { path = "../../bottlerocket-release" }
handlebars = "3.0"
http = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion sources/api/storewolf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bottlerocket-release = { path = "../../bottlerocket-release" }
log = "0.4"
models = { path = "../../models" }
rand = { version = "0.7", default-features = false, features = ["std"] }
semver = "0.10"
semver = "0.11"
simplelog = "0.8"
snafu = "0.6"
toml = "0.5"
Expand Down
4 changes: 2 additions & 2 deletions sources/api/thar-be-updates/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ fs2 = "0.4.3"
http = "0.2.1"
log = "0.4.8"
models = { path = "../../models" }
nix = "0.18.0"
nix = "0.19.0"
num-derive = "0.3.0"
num-traits = "0.2.12"
semver = { version = "0.10", features = [ "serde" ] }
semver = { version = "0.11", features = [ "serde" ] }
serde = { version = "1.0.111", features = [ "derive" ] }
serde_json = "1.0.53"
serde_plain = "0.3.0"
Expand Down
2 changes: 1 addition & 1 deletion sources/api/thar-be-updates/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ fn write_update_status(update_status: &UpdateStatus) -> Result<()> {
/// This macros encapsulates the boilerplate code for dispatching the update command in a forked process
macro_rules! fork_and_return {
($child_process:block) => {
match fork() {
match unsafe { fork() } {
Ok(ForkResult::Parent { child, .. }) => {
debug!("forked child pid: {}", child);
// Exit immediately as the parent
Expand Down
2 changes: 1 addition & 1 deletion sources/bottlerocket-release/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exclude = ["README.md"]
[dependencies]
envy = "0.4"
log = "0.4"
semver = { version = "0.10", features = ["serde"] }
semver = { version = "0.11", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
snafu = "0.6"

Expand Down
2 changes: 1 addition & 1 deletion sources/ghostdog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exclude = ["README.md"]
[dependencies]
argh = "0.1.3"
gptman = { version = "0.6.1", default-features = false }
hex-literal = "0.2.0"
hex-literal = "0.3.0"
lazy_static = "1.2"
signpost = { path = "../updater/signpost" }
snafu = "0.6"
Expand Down
4 changes: 2 additions & 2 deletions sources/models/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ build = "build.rs"
exclude = ["README.md"]

[dependencies]
base64 = "0.12"
base64 = "0.13"
bottlerocket-release = { path = "../bottlerocket-release" }
lazy_static = "1.2"
model-derive = { path = "model-derive" }
regex = "1.1"
semver = "0.10.0"
semver = "0.11.0"
serde = { version = "1.0", features = ["derive"] }
serde_plain = "0.3.0"
snafu = "0.6"
Expand Down
2 changes: 1 addition & 1 deletion sources/updater/signpost/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exclude = ["README.md"]
bit_field = "0.10.0"
block-party = { path = "../block-party" }
gptman = { version = "0.6.1", default-features = false }
hex-literal = "0.2.0"
hex-literal = "0.3.0"
serde = { version = "1.0.91", features = ["derive"] }
serde_plain = "0.3.0"
snafu = { version = "0.6.0", default-features = false, features = ["std"] }
3 changes: 1 addition & 2 deletions sources/updater/update_metadata/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ exclude = ["README.md"]
[dependencies]
chrono = { version = "0.4.9", features = ["serde"] }
parse-datetime = { path = "../../parse-datetime" }
rand = "0.7.0"
regex = "1.1"
semver = { version = "0.10.0", features = ["serde"] }
semver = { version = "0.11.0", features = ["serde"] }
serde = { version = "1.0.100", features = ["derive"] }
serde_json = "1.0.40"
serde_plain = "0.3.0"
Expand Down
3 changes: 1 addition & 2 deletions sources/updater/updog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ log = "0.4"
lz4 = "1.23.1"
rand = "0.7.0"
reqwest = { version = "0.10.1", default-features = false, features = ["rustls-tls", "blocking"] }
semver = "0.10.0"
semver = "0.11.0"
serde = { version = "1.0.100", features = ["derive"] }
serde_json = "1.0.40"
serde_plain = "0.3.0"
Expand All @@ -27,7 +27,6 @@ toml = "0.5.1"
tough = { version = "0.8", features = ["http"] }
update_metadata = { path = "../update_metadata" }
structopt = "0.3"
migrator = { path = "../../api/migration/migrator" }
url = "2.1.0"
signal-hook = "0.1.13"
models = { path = "../../models" }
Expand Down
Loading