From 9684c24b5790374fc104523f5f120e44bdfccd76 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2020 17:07:25 +0000 Subject: [PATCH 1/7] Bump libloading from 0.5.2 to 0.6.1 Bumps [libloading](https://github.com/nagisa/rust_libloading) from 0.5.2 to 0.6.1. - [Release notes](https://github.com/nagisa/rust_libloading/releases) - [Commits](https://github.com/nagisa/rust_libloading/compare/0.5.2...0.6.1) Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 12 ++++++++++-- runtime/Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f658321b717a44..8cb61af12a8c82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1959,6 +1959,14 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "libloading" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "librocksdb-sys" version = "6.2.4" @@ -4495,7 +4503,7 @@ dependencies = [ "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", - "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4505,7 +4513,6 @@ dependencies = [ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-bpf-loader-program 1.2.0", "solana-logger 1.2.0", "solana-measure 1.2.0", "solana-metrics 1.2.0", @@ -6505,6 +6512,7 @@ dependencies = [ "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" "checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +"checksum libloading 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c4f51b790f5bdb65acb4cc94bb81d7b2ee60348a5431ac1467d390b017600b0" "checksum librocksdb-sys 6.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0785e816e1e11e7599388a492c61ef80ddc2afc91e313e61662cce537809be" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index a49359f92fc481..05cddc5609ab0e 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -17,7 +17,7 @@ fs_extra = "1.1.0" itertools = "0.9.0" lazy_static = "1.4.0" libc = "0.2.69" -libloading = "0.5.2" +libloading = "0.6.1" log = "0.4.8" memmap = "0.7.0" num-derive = { version = "0.3" } From f9bf78784772048c7083a62d1be97210eea9cb24 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Fri, 17 Apr 2020 23:20:43 +0900 Subject: [PATCH 2/7] Actually fix minor version incompat. API change... --- runtime/src/native_loader.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/src/native_loader.rs b/runtime/src/native_loader.rs index 903b62b36d6b84..00e271ee857112 100644 --- a/runtime/src/native_loader.rs +++ b/runtime/src/native_loader.rs @@ -81,12 +81,12 @@ impl NativeLoader { } #[cfg(windows)] - fn library_open(path: &PathBuf) -> std::io::Result { + fn library_open(path: &PathBuf) -> Result { Library::new(path) } #[cfg(not(windows))] - fn library_open(path: &PathBuf) -> std::io::Result { + fn library_open(path: &PathBuf) -> Result { // Linux tls bug can cause crash on dlclose(), workaround by never unloading Library::open(Some(path), libc::RTLD_NODELETE | libc::RTLD_NOW) } From 635f526e92fdf1a2cc7de21b1d7aabbb24110e7c Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Tue, 31 Mar 2020 16:15:53 +0900 Subject: [PATCH 3/7] Experiment to backpropagate Cargo.lock updates to all lock files --- ci/docker-run.sh | 39 ++++++++++++++++++++++++++++- ci/test-checks.sh | 24 ++++++++++++++++++ scripts/cargo-for-all-lock-files.sh | 11 ++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100755 scripts/cargo-for-all-lock-files.sh diff --git a/ci/docker-run.sh b/ci/docker-run.sh index 5feeb7a6092014..9c5710c1dc556f 100755 --- a/ci/docker-run.sh +++ b/ci/docker-run.sh @@ -76,6 +76,19 @@ ARGS+=( --env CRATES_IO_TOKEN ) +if [[ $BUILDKITE_LABEL == "checks" ]] && echo "$BUILDKITE_BRANCH" | grep -E '^pull/[0-9]+/head$'; then + api_base="https://api.github.com/repos/solana-labs/solana/pulls" + pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+') + branch=$(curl -s "$api_base/$pr_num" | ruby -r json -e 'puts JSON.parse(STDIN.read())["head"]["ref"]') + source_repo=$(curl -s "$api_base/$pr_num" | ruby -r json -e 'puts JSON.parse(STDIN.read())["head"]["repo"]["full_name"]') + + if [[ $source_repo == "solana-labs/solana" ]] && echo "$branch" | grep "^dependabot/cargo/"; then + export CI_WITH_DEPENDABOT=true + ARGS+=(--env CI_WITH_DEPENDABOT) + fi +fi + + # Also propagate environment variables needed for codecov # https://docs.codecov.io/docs/testing-with-docker#section-codecov-inside-docker # We normalize CI to `1`; but codecov expects it to be `true` to detect Buildkite... @@ -96,4 +109,28 @@ fi set -x # shellcheck disable=SC2086 -exec docker run "${ARGS[@]}" $CODECOV_ENVS "$IMAGE" "$@" +if docker run "${ARGS[@]}" $CODECOV_ENVS "$IMAGE" "$@"; then + docker_status=0 +else + docker_status=$? +fi + +if [[ -n $CI_WITH_DEPENDABOT && $(git status --short :**/Cargo.lock | wc -l) -gt 0 ]]; then + ( + echo --- "(FAILING) Backpropagating dependabot-triggered Cargo.lock updates" + set -x + + git add :**/Cargo.lock + NAME="dependabot-buildkite" + GIT_AUTHOR_NAME="$NAME" \ + GIT_COMMITTER_NAME="$NAME" \ + EMAIL="dependabot-buildkite@noreply.solana.com" \ + git commit -m "Update all Cargo lock files" + git push origin "HEAD:$branch" + + echo "Source branch is updated; failing this build for the next" + exit 1 + ) +fi + +exit $docker_status diff --git a/ci/test-checks.sh b/ci/test-checks.sh index 5b5890985f38ce..35a7abe1dadb0b 100755 --- a/ci/test-checks.sh +++ b/ci/test-checks.sh @@ -15,6 +15,30 @@ _ git show HEAD --check --oneline _ cargo +"$rust_stable" fmt --all -- --check +( + set -x + if [[ -n $CI_WITH_DEPENDABOT ]]; then + commit_range="$(git merge-base HEAD origin/master)..HEAD" + parsed_update_args="$( + git log "$commit_range" --author "dependabot-preview" --oneline -n1 | + grep -o 'Bump.*$' | + sed -r 's/Bump ([^ ]+) from [^ ]+ to ([^ ]+)/-p \1 --precise \2/' + )" + if [[ -n $parsed_update_args ]]; then + # shellcheck disable=SC2086 + _ scripts/cargo-for-all-lock-files.sh update $parsed_update_args + fi + fi + if _ scripts/cargo-for-all-lock-files.sh check --locked; then + true + else + check_status=$? + echo "Some Cargo.lock is outdated; please update them as well" + echo "protip: you can use ./scripts/cargo-for-all-lock-files.sh update ..." + exit "$check_status" + fi +) + # Clippy gets stuck for unknown reasons if sdk-c is included in the build, so check it separately. # See https://github.com/solana-labs/solana/issues/5503 _ cargo +"$rust_stable" clippy --version diff --git a/scripts/cargo-for-all-lock-files.sh b/scripts/cargo-for-all-lock-files.sh new file mode 100755 index 00000000000000..3ed8aa7674ab14 --- /dev/null +++ b/scripts/cargo-for-all-lock-files.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -ex + +for lock_file in $(git ls-files :**/Cargo.lock) +do + ( + cd "$(dirname "$lock_file")" + cargo "$@" + ) +done From 045dbd7c35af4f0ab1e5bf67c0e7c6a50f6ef982 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Fri, 17 Apr 2020 22:36:40 +0900 Subject: [PATCH 4/7] Move most of dependabot-specific code to its own file --- ci/buildkite.yml | 7 +++++++ ci/dependabot-pr.sh | 37 +++++++++++++++++++++++++++++++++++++ ci/dependabot-updater.sh | 16 ++++++++++++++++ ci/docker-run.sh | 39 +-------------------------------------- ci/test-checks.sh | 33 +++++++++------------------------ 5 files changed, 70 insertions(+), 62 deletions(-) create mode 100755 ci/dependabot-pr.sh create mode 100755 ci/dependabot-updater.sh diff --git a/ci/buildkite.yml b/ci/buildkite.yml index 9b3c62da5ec940..00c80f0d1e7ea2 100644 --- a/ci/buildkite.yml +++ b/ci/buildkite.yml @@ -5,6 +5,13 @@ # Release tags use buildkite-release.yml instead steps: + - command: "ci/dependabot-pr.sh" + name: "dependabot" + timeout_in_minutes: 5 + if: build.env("GITHUB_USER") == "ryoqun" + + - wait + - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-checks.sh" name: "checks" timeout_in_minutes: 20 diff --git a/ci/dependabot-pr.sh b/ci/dependabot-pr.sh new file mode 100755 index 00000000000000..9fe9ce860b3dca --- /dev/null +++ b/ci/dependabot-pr.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +set -ex + +cd "$(dirname "$0")/.." + +if ! echo "$BUILDKITE_BRANCH" | grep -E '^pull/[0-9]+/head$'; then + echo "not pull request!?" + exit 1 +fi + +source ci/_ +source ci/rust-version.sh stable + +ci/docker-run.sh $rust_nightly_docker_image ci/dependabot-updater.sh + +if [[ $(git status --short :**/Cargo.lock | wc -l) -gt 0 ]]; then + ( + echo --- "(FAILING) Backpropagating dependabot-triggered Cargo.lock updates" + + git add :**/Cargo.lock + NAME="dependabot-buildkite" + GIT_AUTHOR_NAME="$NAME" \ + GIT_COMMITTER_NAME="$NAME" \ + EMAIL="dependabot-buildkite@noreply.solana.com" \ + git commit -m "Update all Cargo lock files" + api_base="https://api.github.com/repos/solana-labs/solana/pulls" + pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+') + branch=$(curl -s "$api_base/$pr_num" | ruby -r json -e 'puts JSON.parse(STDIN.read())["head"]["ref"]') + git push origin "HEAD:$branch" + + echo "Source branch is updated; failing this build for the next" + exit 1 + ) +fi + +echo --- ok diff --git a/ci/dependabot-updater.sh b/ci/dependabot-updater.sh new file mode 100755 index 00000000000000..ed07eb1c2f5675 --- /dev/null +++ b/ci/dependabot-updater.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +set -ex + +commit_range="$(git merge-base HEAD origin/master)..HEAD" +parsed_update_args="$( + git log "$commit_range" --author "dependabot-preview" --oneline -n1 | + grep -o 'Bump.*$' | + sed -r 's/Bump ([^ ]+) from [^ ]+ to ([^ ]+)/-p \1 --precise \2/' +)" +if [[ -n $parsed_update_args ]]; then + # shellcheck disable=SC2086 + _ scripts/cargo-for-all-lock-files.sh update $parsed_update_args +fi + +echo --- ok diff --git a/ci/docker-run.sh b/ci/docker-run.sh index 9c5710c1dc556f..5feeb7a6092014 100755 --- a/ci/docker-run.sh +++ b/ci/docker-run.sh @@ -76,19 +76,6 @@ ARGS+=( --env CRATES_IO_TOKEN ) -if [[ $BUILDKITE_LABEL == "checks" ]] && echo "$BUILDKITE_BRANCH" | grep -E '^pull/[0-9]+/head$'; then - api_base="https://api.github.com/repos/solana-labs/solana/pulls" - pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+') - branch=$(curl -s "$api_base/$pr_num" | ruby -r json -e 'puts JSON.parse(STDIN.read())["head"]["ref"]') - source_repo=$(curl -s "$api_base/$pr_num" | ruby -r json -e 'puts JSON.parse(STDIN.read())["head"]["repo"]["full_name"]') - - if [[ $source_repo == "solana-labs/solana" ]] && echo "$branch" | grep "^dependabot/cargo/"; then - export CI_WITH_DEPENDABOT=true - ARGS+=(--env CI_WITH_DEPENDABOT) - fi -fi - - # Also propagate environment variables needed for codecov # https://docs.codecov.io/docs/testing-with-docker#section-codecov-inside-docker # We normalize CI to `1`; but codecov expects it to be `true` to detect Buildkite... @@ -109,28 +96,4 @@ fi set -x # shellcheck disable=SC2086 -if docker run "${ARGS[@]}" $CODECOV_ENVS "$IMAGE" "$@"; then - docker_status=0 -else - docker_status=$? -fi - -if [[ -n $CI_WITH_DEPENDABOT && $(git status --short :**/Cargo.lock | wc -l) -gt 0 ]]; then - ( - echo --- "(FAILING) Backpropagating dependabot-triggered Cargo.lock updates" - set -x - - git add :**/Cargo.lock - NAME="dependabot-buildkite" - GIT_AUTHOR_NAME="$NAME" \ - GIT_COMMITTER_NAME="$NAME" \ - EMAIL="dependabot-buildkite@noreply.solana.com" \ - git commit -m "Update all Cargo lock files" - git push origin "HEAD:$branch" - - echo "Source branch is updated; failing this build for the next" - exit 1 - ) -fi - -exit $docker_status +exec docker run "${ARGS[@]}" $CODECOV_ENVS "$IMAGE" "$@" diff --git a/ci/test-checks.sh b/ci/test-checks.sh index 35a7abe1dadb0b..6fdcec69cba59d 100755 --- a/ci/test-checks.sh +++ b/ci/test-checks.sh @@ -13,31 +13,16 @@ export RUSTFLAGS="-D warnings" # Look for failed mergify.io backports _ git show HEAD --check --oneline -_ cargo +"$rust_stable" fmt --all -- --check +if _ scripts/cargo-for-all-lock-files.sh check --locked; then + true +else + check_status=$? + echo "Some Cargo.lock is outdated; please update them as well" + echo "protip: you can use ./scripts/cargo-for-all-lock-files.sh update ..." + exit "$check_status" +fi -( - set -x - if [[ -n $CI_WITH_DEPENDABOT ]]; then - commit_range="$(git merge-base HEAD origin/master)..HEAD" - parsed_update_args="$( - git log "$commit_range" --author "dependabot-preview" --oneline -n1 | - grep -o 'Bump.*$' | - sed -r 's/Bump ([^ ]+) from [^ ]+ to ([^ ]+)/-p \1 --precise \2/' - )" - if [[ -n $parsed_update_args ]]; then - # shellcheck disable=SC2086 - _ scripts/cargo-for-all-lock-files.sh update $parsed_update_args - fi - fi - if _ scripts/cargo-for-all-lock-files.sh check --locked; then - true - else - check_status=$? - echo "Some Cargo.lock is outdated; please update them as well" - echo "protip: you can use ./scripts/cargo-for-all-lock-files.sh update ..." - exit "$check_status" - fi -) +_ cargo +"$rust_stable" fmt --all -- --check # Clippy gets stuck for unknown reasons if sdk-c is included in the build, so check it separately. # See https://github.com/solana-labs/solana/issues/5503 From f3782941bdf4e701df674f80c65f1f8c5142bb50 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Fri, 17 Apr 2020 22:50:19 +0900 Subject: [PATCH 5/7] Various cleanups --- ci/dependabot-pr.sh | 5 ++--- ci/dependabot-updater.sh | 6 +++++- scripts/cargo-for-all-lock-files.sh | 11 +++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ci/dependabot-pr.sh b/ci/dependabot-pr.sh index 9fe9ce860b3dca..0f5f99586333c4 100755 --- a/ci/dependabot-pr.sh +++ b/ci/dependabot-pr.sh @@ -9,7 +9,6 @@ if ! echo "$BUILDKITE_BRANCH" | grep -E '^pull/[0-9]+/head$'; then exit 1 fi -source ci/_ source ci/rust-version.sh stable ci/docker-run.sh $rust_nightly_docker_image ci/dependabot-updater.sh @@ -23,10 +22,10 @@ if [[ $(git status --short :**/Cargo.lock | wc -l) -gt 0 ]]; then GIT_AUTHOR_NAME="$NAME" \ GIT_COMMITTER_NAME="$NAME" \ EMAIL="dependabot-buildkite@noreply.solana.com" \ - git commit -m "Update all Cargo lock files" + git commit -m "[auto-commit] Update all Cargo lock files" api_base="https://api.github.com/repos/solana-labs/solana/pulls" pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+') - branch=$(curl -s "$api_base/$pr_num" | ruby -r json -e 'puts JSON.parse(STDIN.read())["head"]["ref"]') + branch=$(curl -s "$api_base/$pr_num" | python -c 'import json,sys;print json.load(sys.stdin)["head"]["ref"]') git push origin "HEAD:$branch" echo "Source branch is updated; failing this build for the next" diff --git a/ci/dependabot-updater.sh b/ci/dependabot-updater.sh index ed07eb1c2f5675..f8349c6a16381b 100755 --- a/ci/dependabot-updater.sh +++ b/ci/dependabot-updater.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -ex +cd "$(dirname "$0")/.." +source ci/_ commit_range="$(git merge-base HEAD origin/master)..HEAD" parsed_update_args="$( @@ -8,9 +10,11 @@ parsed_update_args="$( grep -o 'Bump.*$' | sed -r 's/Bump ([^ ]+) from [^ ]+ to ([^ ]+)/-p \1 --precise \2/' )" +package=$(echo "$parsed_update_args" | awk '{print $2}') if [[ -n $parsed_update_args ]]; then # shellcheck disable=SC2086 - _ scripts/cargo-for-all-lock-files.sh update $parsed_update_args + _TARGET_LOCK_FILES=$(git grep --files-with-matches "$package" :**/Cargo.lock) \ + _ scripts/cargo-for-all-lock-files.sh update $parsed_update_args fi echo --- ok diff --git a/scripts/cargo-for-all-lock-files.sh b/scripts/cargo-for-all-lock-files.sh index 3ed8aa7674ab14..fd60e9f1cf4622 100755 --- a/scripts/cargo-for-all-lock-files.sh +++ b/scripts/cargo-for-all-lock-files.sh @@ -1,10 +1,17 @@ #!/usr/bin/env bash -set -ex +set -e -for lock_file in $(git ls-files :**/Cargo.lock) +if [[ -n $_TARGET_LOCK_FILES ]]; then + files="$_TARGET_LOCK_FILES" +else + files="$(git ls-files :**/Cargo.lock)" +fi + +for lock_file in $files do ( + set -x cd "$(dirname "$lock_file")" cargo "$@" ) From e37755ae2c5329ce11ba7ddf7f4d1e6e897a975d Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Mon, 20 Apr 2020 19:51:08 +0900 Subject: [PATCH 6/7] Clean up shells and stop obscure API... --- ci/dependabot-pr.sh | 40 ++++++++++++++--------------- ci/dependabot-updater.sh | 5 ++-- scripts/cargo-for-all-lock-files.sh | 30 ++++++++++++++++++---- 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/ci/dependabot-pr.sh b/ci/dependabot-pr.sh index 0f5f99586333c4..89ec7df60b5b94 100755 --- a/ci/dependabot-pr.sh +++ b/ci/dependabot-pr.sh @@ -5,7 +5,7 @@ set -ex cd "$(dirname "$0")/.." if ! echo "$BUILDKITE_BRANCH" | grep -E '^pull/[0-9]+/head$'; then - echo "not pull request!?" + echo "not pull request!?" >&2 exit 1 fi @@ -13,24 +13,24 @@ source ci/rust-version.sh stable ci/docker-run.sh $rust_nightly_docker_image ci/dependabot-updater.sh -if [[ $(git status --short :**/Cargo.lock | wc -l) -gt 0 ]]; then - ( - echo --- "(FAILING) Backpropagating dependabot-triggered Cargo.lock updates" - - git add :**/Cargo.lock - NAME="dependabot-buildkite" - GIT_AUTHOR_NAME="$NAME" \ - GIT_COMMITTER_NAME="$NAME" \ - EMAIL="dependabot-buildkite@noreply.solana.com" \ - git commit -m "[auto-commit] Update all Cargo lock files" - api_base="https://api.github.com/repos/solana-labs/solana/pulls" - pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+') - branch=$(curl -s "$api_base/$pr_num" | python -c 'import json,sys;print json.load(sys.stdin)["head"]["ref"]') - git push origin "HEAD:$branch" - - echo "Source branch is updated; failing this build for the next" - exit 1 - ) +if [[ $(git status --short :**/Cargo.lock | wc -l) -eq 0 ]]; then + echo --- ok + exit 0 fi -echo --- ok +echo --- "(FAILING) Backpropagating dependabot-triggered Cargo.lock updates" + +name="dependabot-buildkite" +api_base="https://api.github.com/repos/solana-labs/solana/pulls" +pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+') +branch=$(curl -s "$api_base/$pr_num" | python -c 'import json,sys;print json.load(sys.stdin)["head"]["ref"]') + +git add :**/Cargo.lock +EMAIL="dependabot-buildkite@noreply.solana.com" \ + GIT_AUTHOR_NAME="$name" \ + GIT_COMMITTER_NAME="$name" \ + git commit -m "[auto-commit] Update all Cargo lock files" +git push origin "HEAD:$branch" + +echo "Source branch is updated; failing this build for the next" +exit 1 diff --git a/ci/dependabot-updater.sh b/ci/dependabot-updater.sh index f8349c6a16381b..ab349ea192caf3 100755 --- a/ci/dependabot-updater.sh +++ b/ci/dependabot-updater.sh @@ -13,8 +13,9 @@ parsed_update_args="$( package=$(echo "$parsed_update_args" | awk '{print $2}') if [[ -n $parsed_update_args ]]; then # shellcheck disable=SC2086 - _TARGET_LOCK_FILES=$(git grep --files-with-matches "$package" :**/Cargo.lock) \ - _ scripts/cargo-for-all-lock-files.sh update $parsed_update_args + _ scripts/cargo-for-all-lock-files.sh \ + "$(git grep --files-with-matches "$package" :**/Cargo.lock)" -- \ + update $parsed_update_args fi echo --- ok diff --git a/scripts/cargo-for-all-lock-files.sh b/scripts/cargo-for-all-lock-files.sh index fd60e9f1cf4622..183b7616727c67 100755 --- a/scripts/cargo-for-all-lock-files.sh +++ b/scripts/cargo-for-all-lock-files.sh @@ -2,17 +2,37 @@ set -e -if [[ -n $_TARGET_LOCK_FILES ]]; then - files="$_TARGET_LOCK_FILES" +shifted_args=() +while [[ -n $1 ]]; do + if [[ $1 = -- ]]; then + escape_marker=found + shift + break + else + shifted_args+=("$1") + shift + fi +done + +# When "--" appear at the first and shifted_args is empty, consume it here +# to unambiguously pass and use any other "--" for cargo +if [[ -n $escape_marker && ${#shifted_args[@]} -gt 0 ]]; then + files="${shifted_args[*]}" + for file in $files; do + if [[ $file = "${file%Cargo.lock}" ]]; then + echo "$0: unrecognizable as Cargo.lock path (prepend \"--\"?): $file" >&2 + exit 1 + fi + done + shifted_args=() else files="$(git ls-files :**/Cargo.lock)" fi -for lock_file in $files -do +for lock_file in $files; do ( set -x cd "$(dirname "$lock_file")" - cargo "$@" + cargo "${shifted_args[@]}" "$@" ) done From 9f27cd95575eea056a386e3de34de0f2de12e980 Mon Sep 17 00:00:00 2001 From: dependabot-buildkite Date: Mon, 20 Apr 2020 03:53:24 -0700 Subject: [PATCH 7/7] [auto-commit] Update all Cargo lock files --- programs/bpf/Cargo.lock | 73 ++++++++++++++--------------- programs/librapay/Cargo.lock | 91 ++++++++++++++++++------------------ 2 files changed, 81 insertions(+), 83 deletions(-) diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 3eca38ba997e6b..fadd15c104f795 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -54,7 +54,7 @@ name = "atty" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -75,7 +75,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -86,7 +86,7 @@ version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -306,7 +306,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -667,7 +667,7 @@ name = "gethostname" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -677,7 +677,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -826,7 +826,7 @@ name = "iovec" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -856,7 +856,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "jemalloc-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -867,7 +867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -876,7 +876,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "jemalloc-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -885,7 +885,7 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -916,15 +916,14 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libloading" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -965,7 +964,7 @@ name = "memmap" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1001,7 +1000,7 @@ dependencies = [ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1015,7 +1014,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1036,7 +1035,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1099,7 +1098,7 @@ name = "num_cpus" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1134,7 +1133,7 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1282,7 +1281,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1294,7 +1293,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1312,7 +1311,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1386,7 +1385,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1398,7 +1397,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1528,7 +1527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "web-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1629,7 +1628,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1730,7 +1729,7 @@ version = "1.2.0" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1907,7 +1906,7 @@ dependencies = [ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1969,8 +1968,8 @@ dependencies = [ "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", - "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2097,7 +2096,7 @@ dependencies = [ "combine 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "elfkit 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "hash32 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2189,7 +2188,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2243,7 +2242,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2435,7 +2434,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2869,8 +2868,8 @@ dependencies = [ "checksum js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "7889c7c36282151f6bf465be4700359318aef36baa951462382eae49e9577cf9" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" -"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +"checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" +"checksum libloading 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c4f51b790f5bdb65acb4cc94bb81d7b2ee60348a5431ac1467d390b017600b0" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" diff --git a/programs/librapay/Cargo.lock b/programs/librapay/Cargo.lock index e24f56447bc305..131d5af55bc577 100644 --- a/programs/librapay/Cargo.lock +++ b/programs/librapay/Cargo.lock @@ -52,7 +52,7 @@ name = "atty" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -73,7 +73,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -84,7 +84,7 @@ version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -332,7 +332,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -501,7 +501,7 @@ name = "dirs" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -521,7 +521,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -599,7 +599,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -609,7 +609,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -774,7 +774,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "c_linked_list 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "get_if_addrs-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -784,7 +784,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -792,7 +792,7 @@ name = "gethostname" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -802,7 +802,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1028,7 +1028,7 @@ name = "iovec" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1058,7 +1058,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "jemalloc-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1069,7 +1069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1078,7 +1078,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "jemalloc-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1087,7 +1087,7 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1152,15 +1152,14 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libloading" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1205,7 +1204,7 @@ name = "memmap" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1223,7 +1222,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "mach_o_sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1252,7 +1251,7 @@ dependencies = [ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1266,7 +1265,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1297,7 +1296,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1357,7 +1356,7 @@ name = "num_cpus" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1467,7 +1466,7 @@ name = "parking_lot_core" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1480,7 +1479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1764,7 +1763,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1776,7 +1775,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1794,7 +1793,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1885,7 +1884,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1897,7 +1896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2052,7 +2051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "web-sys 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2161,7 +2160,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2360,7 +2359,7 @@ dependencies = [ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2464,8 +2463,8 @@ dependencies = [ "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", - "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3036,7 +3035,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3101,7 +3100,7 @@ name = "thread-id" version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3138,7 +3137,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3348,7 +3347,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3487,7 +3486,7 @@ name = "wait-timeout" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3634,7 +3633,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3846,8 +3845,8 @@ dependencies = [ "checksum lalrpop 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)" = "64dc3698e75d452867d9bd86f4a723f452ce9d01fe1d55990b79f0c790aa67db" "checksum lalrpop-util 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c277d18683b36349ab5cd030158b54856fca6bb2d5dc5263b06288f486958b7c" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" -"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +"checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" +"checksum libloading 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c4f51b790f5bdb65acb4cc94bb81d7b2ee60348a5431ac1467d390b017600b0" "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum mach_o_sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3e854583a83f20cf329bb9283366335387f7db59d640d1412167e05fedb98826"