From 0cdac7204fc843ccbe96f8760d6cce1bba113650 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 22:05:16 +0000 Subject: [PATCH 001/133] build(deps): bump assert_cmd from 2.0.8 to 2.0.10 Bumps [assert_cmd](https://github.com/assert-rs/assert_cmd) from 2.0.8 to 2.0.10. - [Release notes](https://github.com/assert-rs/assert_cmd/releases) - [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_cmd/compare/v2.0.8...v2.0.10) --- updated-dependencies: - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 31 +++++++++++++++++++++++++------ Cargo.toml | 2 +- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bdb50151..bfb4716b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,15 +49,22 @@ dependencies = [ "memchr", ] +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + [[package]] name = "assert_cmd" -version = "2.0.8" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e" +checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd" dependencies = [ + "anstyle", "bstr", "doc-comment", - "predicates", + "predicates 3.0.1", "predicates-core", "predicates-tree", "wait-timeout", @@ -71,7 +78,7 @@ checksum = "d94b2a3f3786ff2996a98afbd6b4e5b7e890d685ccf67577f508ee2342c71cc9" dependencies = [ "doc-comment", "globwalk", - "predicates", + "predicates 2.1.5", "predicates-core", "predicates-tree", "tempfile", @@ -1231,11 +1238,23 @@ dependencies = [ "predicates-core", ] +[[package]] +name = "predicates" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +dependencies = [ + "anstyle", + "difflib", + "itertools", + "predicates-core", +] + [[package]] name = "predicates-core" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" diff --git a/Cargo.toml b/Cargo.toml index a352fa6c..096b0af9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ zip = "0.6.4" openssl = { version = "0.10.45", features = ["vendored"] } [dev-dependencies] -assert_cmd = "2.0.8" +assert_cmd = "2.0.10" assert_fs = "1.0.10" [package.metadata.binstall] From 36e99df125c13380849ae9645918925a1088db4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 22:05:04 +0000 Subject: [PATCH 002/133] build(deps): bump thiserror from 1.0.39 to 1.0.40 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.39 to 1.0.40. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.39...1.0.40) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 43 +++++++++++++++++++++++++++---------------- Cargo.toml | 2 +- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bfb4716b..9b53cb2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,7 +92,7 @@ checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -260,7 +260,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -985,7 +985,7 @@ checksum = "97c2401ab7ac5282ca5c8b518a87635b1a93762b0b90b9990c509888eeccba29" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1087,7 +1087,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1200,7 +1200,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1275,7 +1275,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1566,7 +1566,7 @@ checksum = "d071a94a3fac4aff69d023a7f411e33f40f3483f8c5190b1953822b6b76d7630" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1694,7 +1694,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -1742,6 +1742,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "tar" version = "0.4.38" @@ -1804,22 +1815,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.4", ] [[package]] @@ -1891,7 +1902,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2155,7 +2166,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -2189,7 +2200,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index 096b0af9..4a199ab7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ serde_json = "1.0.94" strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" tempfile = "3.4.0" -thiserror = "1.0.39" +thiserror = "1.0.40" tokio = { version = "1.26.0", features = ["full"] } tokio-retry = "0.3.0" toml = "0.7.3" From 45e72fb1a3abdb1576001ea855fb26e1f2a79b78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 19:55:42 +0000 Subject: [PATCH 003/133] build(deps): bump assert_fs from 1.0.10 to 1.0.12 Bumps [assert_fs](https://github.com/assert-rs/assert_fs) from 1.0.10 to 1.0.12. - [Release notes](https://github.com/assert-rs/assert_fs/releases) - [Changelog](https://github.com/assert-rs/assert_fs/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_fs/compare/v1.0.10...v1.0.12) --- updated-dependencies: - dependency-name: assert_fs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 20 +++++--------------- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b53cb2e..f87d9777 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ "anstyle", "bstr", "doc-comment", - "predicates 3.0.1", + "predicates", "predicates-core", "predicates-tree", "wait-timeout", @@ -72,13 +72,14 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d94b2a3f3786ff2996a98afbd6b4e5b7e890d685ccf67577f508ee2342c71cc9" +checksum = "e9d5bf7e5441c6393b5a9670a5036abe6b4847612f594b870f7332dbf10cf6fa" dependencies = [ + "anstyle", "doc-comment", "globwalk", - "predicates 2.1.5", + "predicates", "predicates-core", "predicates-tree", "tempfile", @@ -1227,17 +1228,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "itertools", - "predicates-core", -] - [[package]] name = "predicates" version = "3.0.1" diff --git a/Cargo.toml b/Cargo.toml index 4a199ab7..9d85f13b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ openssl = { version = "0.10.45", features = ["vendored"] } [dev-dependencies] assert_cmd = "2.0.10" -assert_fs = "1.0.10" +assert_fs = "1.0.12" [package.metadata.binstall] bin-dir = "{ bin }{ binary-ext }" From f8b34cfc9bf3396fed95e2b533ef30e131fdfcd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 11:55:15 +0000 Subject: [PATCH 004/133] build(deps): bump openssl from 0.10.45 to 0.10.47 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.45 to 0.10.47. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.45...openssl-v0.10.47) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f87d9777..42377ba2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1067,9 +1067,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "d8b277f87dacc05a6b709965d1cbafac4649d6ce9f3ce9ceb88508b5666dfec9" dependencies = [ "bitflags", "cfg-if", @@ -1108,9 +1108,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "a95792af3c4e0153c3914df2261bedd30a98476f94dc892b67dfe1d89d433a04" dependencies = [ "autocfg", "cc", diff --git a/Cargo.toml b/Cargo.toml index 9d85f13b..3288d2bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ xz2 = "0.1.7" zip = "0.6.4" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.45", features = ["vendored"] } +openssl = { version = "0.10.47", features = ["vendored"] } [dev-dependencies] assert_cmd = "2.0.10" From 47fac62b7ed094f1ccdb9f71003c0d3aaad535a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 19:55:47 +0000 Subject: [PATCH 005/133] build(deps): bump async-trait from 0.1.66 to 0.1.67 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.66 to 0.1.67. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.66...0.1.67) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 42377ba2..4570e864 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,13 +87,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.66" +version = "0.1.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" +checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.4", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3288d2bc..39f12fdc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ categories = ["command-line-utilities", "development-tools", "embedded"] rust-version = "1.64" [dependencies] -async-trait = "0.1.66" +async-trait = "0.1.67" clap = { version = "4.1.8", features = ["derive"] } console = "0.15.5" directories = "4.0.1" From 373a70f9fdf915e63a29e4f118155295208b9faf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 09:24:38 +0000 Subject: [PATCH 006/133] build(deps): bump directories from 4.0.1 to 5.0.0 Bumps [directories](https://github.com/soc/directories-rs) from 4.0.1 to 5.0.0. - [Release notes](https://github.com/soc/directories-rs/releases) - [Commits](https://github.com/soc/directories-rs/commits) --- updated-dependencies: - dependency-name: directories dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 26 +++++++++++++++++++++++--- Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4570e864..72b8b29f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -368,7 +368,16 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", +] + +[[package]] +name = "directories" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74be3be809c18e089de43bdc504652bb2bc473fca8756131f8689db8cf079ba9" +dependencies = [ + "dirs-sys 0.4.0", ] [[package]] @@ -382,6 +391,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "dirs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +dependencies = [ + "libc", + "redox_users", + "windows-sys 0.45.0", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -452,7 +472,7 @@ dependencies = [ "async-trait", "clap", "console", - "directories", + "directories 5.0.0", "env_logger", "flate2", "guess_host_triple", @@ -2051,7 +2071,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "152ff185ca29f7f487c51ca785b0f1d85970c4581f4cdd12ed499227890200f5" dependencies = [ - "directories", + "directories 4.0.1", "semver", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 39f12fdc..c7c5f7de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.64" async-trait = "0.1.67" clap = { version = "4.1.8", features = ["derive"] } console = "0.15.5" -directories = "4.0.1" +directories = "5.0.0" env_logger = "0.10.0" flate2 = "1.0.25" guess_host_triple = "0.1.3" From ef87ecb142f6a1cc4440e52f1de9813b1550f9f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 22:04:44 +0000 Subject: [PATCH 007/133] build(deps): bump reqwest from 0.11.14 to 0.11.15 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.14 to 0.11.15. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.14...v0.11.15) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72b8b29f..bbf71ab4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1393,9 +1393,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" dependencies = [ "base64 0.21.0", "bytes", diff --git a/Cargo.toml b/Cargo.toml index c7c5f7de..719c0ac1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ guess_host_triple = "0.1.3" log = "0.4.17" miette = { version = "5.5.0", features = ["fancy"] } regex = "1.7.1" -reqwest = { version = "0.11.14", features = ["blocking"] } +reqwest = { version = "0.11.15", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.94" strum = { version = "0.24", features = ["derive"] } From 7271dbc36634ff32e7b3d291be460be228c62e92 Mon Sep 17 00:00:00 2001 From: Hakim Mazouz Date: Mon, 27 Mar 2023 15:26:24 +0200 Subject: [PATCH 008/133] fix: download Mac aarch64 versions of gcc --- src/toolchain/gcc.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/toolchain/gcc.rs b/src/toolchain/gcc.rs index 0e0c2b73..95b8e071 100644 --- a/src/toolchain/gcc.rs +++ b/src/toolchain/gcc.rs @@ -141,7 +141,8 @@ impl Installable for Gcc { /// Gets the name of the GCC arch based on the host triple. fn get_arch(host_triple: &HostTriple) -> Result<&str> { match host_triple { - HostTriple::Aarch64AppleDarwin | HostTriple::X86_64AppleDarwin => Ok("macos"), + HostTriple::X86_64AppleDarwin => Ok("macos"), + HostTriple::Aarch64AppleDarwin => Ok("macos-arm64"), HostTriple::X86_64UnknownLinuxGnu => Ok("linux-amd64"), HostTriple::Aarch64UnknownLinuxGnu => Ok("linux-arm64"), HostTriple::X86_64PcWindowsMsvc | HostTriple::X86_64PcWindowsGnu => Ok("win64"), From adebcbe1c1c5e91d9cf0da31af31888535502767 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 22:04:59 +0000 Subject: [PATCH 009/133] build(deps): bump openssl from 0.10.47 to 0.10.48 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.47 to 0.10.48. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.47...openssl-v0.10.48) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bbf71ab4..dda713c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1087,9 +1087,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.47" +version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b277f87dacc05a6b709965d1cbafac4649d6ce9f3ce9ceb88508b5666dfec9" +checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ "bitflags", "cfg-if", @@ -1128,9 +1128,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.82" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a95792af3c4e0153c3914df2261bedd30a98476f94dc892b67dfe1d89d433a04" +checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" dependencies = [ "autocfg", "cc", diff --git a/Cargo.toml b/Cargo.toml index 719c0ac1..31c9ca20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ xz2 = "0.1.7" zip = "0.6.4" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.47", features = ["vendored"] } +openssl = { version = "0.10.48", features = ["vendored"] } [dev-dependencies] assert_cmd = "2.0.10" From 8ac6df56edea143d25954e0fb37bbfd34763439f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 07:44:48 +0000 Subject: [PATCH 010/133] build(deps): bump miette from 5.5.0 to 5.6.0 Bumps [miette](https://github.com/zkat/miette) from 5.5.0 to 5.6.0. - [Release notes](https://github.com/zkat/miette/releases) - [Changelog](https://github.com/zkat/miette/blob/main/CHANGELOG.md) - [Commits](https://github.com/zkat/miette/compare/miette-derive-v5.5.0...miette-derive-v5.6.0) --- updated-dependencies: - dependency-name: miette dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 48 ++++++++++++++---------------------------------- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dda713c9..50ad42b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -96,17 +96,6 @@ dependencies = [ "syn 2.0.4", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -701,15 +690,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.2.6" @@ -980,12 +960,12 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "miette" -version = "5.5.0" +version = "5.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd9b301defa984bbdbe112b4763e093ed191750a0d914a78c1106b2d0fe703" +checksum = "07749fb52853e739208049fb513287c6f448de9103dfa78b05ae01f2fc5809bb" dependencies = [ - "atty", "backtrace", + "is-terminal", "miette-derive", "once_cell", "owo-colors", @@ -1000,9 +980,9 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.5.0" +version = "5.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c2401ab7ac5282ca5c8b518a87635b1a93762b0b90b9990c509888eeccba29" +checksum = "2a07ad93a80d1b92bb44cb42d7c49b49c9aab1778befefad49cceb5e4c5bf460" dependencies = [ "proc-macro2", "quote", @@ -1715,30 +1695,30 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "supports-color" -version = "1.3.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" +checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" dependencies = [ - "atty", + "is-terminal", "is_ci", ] [[package]] name = "supports-hyperlinks" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590b34f7c5f01ecc9d78dba4b3f445f31df750a67621cf31626f3b7441ce6406" +checksum = "4b4806e0b03b9906e76b018a5d821ebf198c8e9dc0829ed3328eeeb5094aed60" dependencies = [ - "atty", + "is-terminal", ] [[package]] name = "supports-unicode" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b945e45b417b125a8ec51f1b7df2f8df7920367700d1f98aedd21e5735f8b2" +checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7" dependencies = [ - "atty", + "is-terminal", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 31c9ca20..67468ab9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ env_logger = "0.10.0" flate2 = "1.0.25" guess_host_triple = "0.1.3" log = "0.4.17" -miette = { version = "5.5.0", features = ["fancy"] } +miette = { version = "5.6.0", features = ["fancy"] } regex = "1.7.1" reqwest = { version = "0.11.15", features = ["blocking"] } retry = "2.0.0" From a92574dd637bbdeac698dda245ad10aadb07a89e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 07:44:28 +0000 Subject: [PATCH 011/133] build(deps): bump clap from 4.1.8 to 4.1.11 Bumps [clap](https://github.com/clap-rs/clap) from 4.1.8 to 4.1.11. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.1.8...v4.1.11) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 26 ++++++++++++++++---------- Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 50ad42b2..daaa9bd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -141,6 +141,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" + [[package]] name = "block-buffer" version = "0.10.4" @@ -227,11 +233,11 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.8" +version = "4.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" dependencies = [ - "bitflags", + "bitflags 2.0.2", "clap_derive", "clap_lex", "is-terminal", @@ -242,9 +248,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.1.8" +version = "4.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" +checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" dependencies = [ "heck", "proc-macro-error", @@ -639,7 +645,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] @@ -1071,7 +1077,7 @@ version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -1334,7 +1340,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1444,7 +1450,7 @@ version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -1516,7 +1522,7 @@ version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", diff --git a/Cargo.toml b/Cargo.toml index 67468ab9..5ee31196 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.64" [dependencies] async-trait = "0.1.67" -clap = { version = "4.1.8", features = ["derive"] } +clap = { version = "4.1.11", features = ["derive"] } console = "0.15.5" directories = "5.0.0" env_logger = "0.10.0" From 26cf330c608c73200cd8a18be58cf0c89666b29f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 08:08:53 +0000 Subject: [PATCH 012/133] build(deps): bump regex from 1.7.1 to 1.7.3 Bumps [regex](https://github.com/rust-lang/regex) from 1.7.1 to 1.7.3. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.7.1...1.7.3) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index daaa9bd8..8db36b0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1356,9 +1356,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -1373,9 +1373,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" diff --git a/Cargo.toml b/Cargo.toml index 5ee31196..9d73a980 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ flate2 = "1.0.25" guess_host_triple = "0.1.3" log = "0.4.17" miette = { version = "5.6.0", features = ["fancy"] } -regex = "1.7.1" +regex = "1.7.3" reqwest = { version = "0.11.15", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.94" From ef483edf2799e665cc2af1fc0ac231598c8e1f11 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Wed, 29 Mar 2023 10:56:19 +0200 Subject: [PATCH 013/133] =?UTF-8?q?docs:=20=F0=9F=93=9D=20Add=20note=20abo?= =?UTF-8?q?ut=20Github=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 254953b0..e971f8cd 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ espup install > **Warning** > -> The generated export file, by default `export-esp`, needs to be sourced in every terminal in Unix systems before building an application. In Windows, environment variables are automatically injected into your system and don't need to be sourced. +> The generated export file, by default `export-esp`, needs to be sourced in every terminal in Unix systems before building an application. On Windows, environment variables are automatically injected into your system and don't need to be sourced. ### Uninstall @@ -115,6 +115,11 @@ Options: > #### Xtensa Rust destination path > Installation paths can be modified by setting the environment variables [`CARGO_HOME`](https://doc.rust-lang.org/cargo/reference/environment-variables.html) and [`RUSTUP_HOME`](https://rust-lang.github.io/rustup/environment-variables.html) before running the `install` command. By default, toolchains will be installed under `/toolchains/esp`, although this can be changed using the `-a/--name` option. +> **Note** +> +> #### GitHub API +> During the installation, we do a few GitHub queries, [which has some limits](https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting). Our number of queries should not hit the limits unless you are running `espup install` command numerous times in a short span of time. We recommend setting the [`GITHUB_TOKEN` environment variable](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret) when using `espup` in CI, if you want to use `espup` on CI, recommend using it via the [`xtensa-toolchain` action](https://github.com/esp-rs/xtensa-toolchain/), and making sure `GITHUB_TOKEN` is not set when using it on a host machine. See https://github.com/esp-rs/xtensa-toolchain/issues/15 for more details on this. + ``` Usage: espup install [OPTIONS] From a9cb3960115cf5f8a13052964b56d0c86eaac041 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 07:45:36 +0000 Subject: [PATCH 014/133] build(deps): bump serde_json from 1.0.94 to 1.0.95 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.94 to 1.0.95. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.94...v1.0.95) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8db36b0c..5ac73c34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1567,9 +1567,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 9d73a980..ba39f775 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ miette = { version = "5.6.0", features = ["fancy"] } regex = "1.7.3" reqwest = { version = "0.11.15", features = ["blocking"] } retry = "2.0.0" -serde_json = "1.0.94" +serde_json = "1.0.95" strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" tempfile = "3.4.0" From 249a3f7e28ea0b0e472cce526957065ca4214fa4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 22:05:28 +0000 Subject: [PATCH 015/133] build(deps): bump tokio from 1.26.0 to 1.27.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.26.0 to 1.27.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.26.0...tokio-1.27.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 11 +++++------ Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ac73c34..3a8f00ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1872,14 +1872,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -1892,13 +1891,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.4", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ba39f775..9c643f75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" tempfile = "3.4.0" thiserror = "1.0.40" -tokio = { version = "1.26.0", features = ["full"] } +tokio = { version = "1.27.0", features = ["full"] } tokio-retry = "0.3.0" toml = "0.7.3" update-informer = "0.6.0" From d7697a74ef479f9bda4d69aff4e3c87fdc5090e5 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Thu, 30 Mar 2023 12:36:30 +0200 Subject: [PATCH 016/133] Fix Ci warnings and bump `clap` (#228) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ci: ⚡️ Fix CI warnings * build: ⬆️ Bump clap to 4.2.0 --- .github/workflows/audit.yaml | 6 +- Cargo.lock | 142 ++++++++++++++++++++--------------- Cargo.toml | 2 +- 3 files changed, 86 insertions(+), 64 deletions(-) diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml index 3e3fc418..62f3a02c 100644 --- a/.github/workflows/audit.yaml +++ b/.github/workflows/audit.yaml @@ -24,12 +24,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@v1 with: toolchain: stable - profile: minimal - override: true - uses: Swatinem/rust-cache@v2 - - uses: actions-rs/audit-check@v1 + - uses: rustsec/audit-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index 3a8f00ed..ab7d0736 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,12 +49,46 @@ dependencies = [ "memchr", ] +[[package]] +name = "anstream" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + [[package]] name = "anstyle" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + [[package]] name = "assert_cmd" version = "2.0.10" @@ -93,7 +127,7 @@ checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.11", ] [[package]] @@ -141,12 +175,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitflags" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" - [[package]] name = "block-buffer" version = "0.10.4" @@ -233,39 +261,59 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.11" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" dependencies = [ - "bitflags 2.0.2", + "clap_builder", "clap_derive", - "clap_lex", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", "strsim", - "termcolor", ] [[package]] name = "clap_derive" -version = "4.1.9" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.11", ] [[package]] name = "clap_lex" -version = "0.3.2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + +[[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" dependencies = [ - "os_str_bytes", + "windows-sys 0.45.0", ] [[package]] @@ -645,7 +693,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags 1.3.2", + "bitflags", "ignore", "walkdir", ] @@ -1077,7 +1125,7 @@ version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -1126,12 +1174,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "owo-colors" version = "3.5.0" @@ -1262,30 +1304,6 @@ dependencies = [ "termtree", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" version = "1.0.52" @@ -1340,7 +1358,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -1450,7 +1468,7 @@ version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ - "bitflags 1.3.2", + "bitflags", "errno", "io-lifetimes", "libc", @@ -1522,7 +1540,7 @@ version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -1740,9 +1758,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.4" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae" +checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" dependencies = [ "proc-macro2", "quote", @@ -1826,7 +1844,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.11", ] [[package]] @@ -1897,7 +1915,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.11", ] [[package]] @@ -2092,6 +2110,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "vcpkg" version = "0.2.15" diff --git a/Cargo.toml b/Cargo.toml index 9c643f75..df525fba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.64" [dependencies] async-trait = "0.1.67" -clap = { version = "4.1.11", features = ["derive"] } +clap = { version = "4.2.0", features = ["derive"] } console = "0.15.5" directories = "5.0.0" env_logger = "0.10.0" From a16d0adc25e5b4f8808ef02ef79cf5b2cb27adab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 06:20:56 +0000 Subject: [PATCH 017/133] build(deps): bump reqwest from 0.11.15 to 0.11.16 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.15 to 0.11.16. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.15...v0.11.16) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab7d0736..9d4e21c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1397,9 +1397,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.15" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ "base64 0.21.0", "bytes", diff --git a/Cargo.toml b/Cargo.toml index df525fba..f89e5ecf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ guess_host_triple = "0.1.3" log = "0.4.17" miette = { version = "5.6.0", features = ["fancy"] } regex = "1.7.3" -reqwest = { version = "0.11.15", features = ["blocking"] } +reqwest = { version = "0.11.16", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.95" strum = { version = "0.24", features = ["derive"] } From b05c7f2e92a205b777c362673394c51a6b1cc124 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 10:38:01 +0000 Subject: [PATCH 018/133] build(deps): bump async-trait from 0.1.67 to 0.1.68 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.67 to 0.1.68. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.67...0.1.68) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d4e21c2..d0f83b29 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.67" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index f89e5ecf..c922c273 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ categories = ["command-line-utilities", "development-tools", "embedded"] rust-version = "1.64" [dependencies] -async-trait = "0.1.67" +async-trait = "0.1.68" clap = { version = "4.2.0", features = ["derive"] } console = "0.15.5" directories = "5.0.0" From 9dc2b697c97c839fe6412755b4e3a28e92bbca37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 22:04:13 +0000 Subject: [PATCH 019/133] build(deps): bump miette from 5.6.0 to 5.7.0 Bumps [miette](https://github.com/zkat/miette) from 5.6.0 to 5.7.0. - [Release notes](https://github.com/zkat/miette/releases) - [Changelog](https://github.com/zkat/miette/blob/main/CHANGELOG.md) - [Commits](https://github.com/zkat/miette/compare/miette-derive-v5.6.0...miette-derive-v5.7.0) --- updated-dependencies: - dependency-name: miette dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 20 +++++++++++++++----- Cargo.toml | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0f83b29..3c388124 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -151,6 +151,15 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "backtrace-ext" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" +dependencies = [ + "backtrace", +] + [[package]] name = "base64" version = "0.13.1" @@ -1014,11 +1023,12 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "miette" -version = "5.6.0" +version = "5.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07749fb52853e739208049fb513287c6f448de9103dfa78b05ae01f2fc5809bb" +checksum = "7abdc09c381c9336b9f2e9bd6067a9a5290d20e2d2e2296f275456121c33ae89" dependencies = [ "backtrace", + "backtrace-ext", "is-terminal", "miette-derive", "once_cell", @@ -1034,13 +1044,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.6.0" +version = "5.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a07ad93a80d1b92bb44cb42d7c49b49c9aab1778befefad49cceb5e4c5bf460" +checksum = "8842972f23939443013dfd3720f46772b743e86f1a81d120d4b6fb090f87de1c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.11", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c922c273..768dc62f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ env_logger = "0.10.0" flate2 = "1.0.25" guess_host_triple = "0.1.3" log = "0.4.17" -miette = { version = "5.6.0", features = ["fancy"] } +miette = { version = "5.7.0", features = ["fancy"] } regex = "1.7.3" reqwest = { version = "0.11.16", features = ["blocking"] } retry = "2.0.0" From 8bb3c233a3a886e19addd45eaf92b66581c10c55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 22:03:59 +0000 Subject: [PATCH 020/133] build(deps): bump tempfile from 3.4.0 to 3.5.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/Stebalien/tempfile/releases) - [Changelog](https://github.com/Stebalien/tempfile/blob/master/NEWS) - [Commits](https://github.com/Stebalien/tempfile/commits) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++---------- Cargo.toml | 2 +- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c388124..f433f363 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -505,6 +505,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -564,7 +575,7 @@ checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "windows-sys 0.45.0", ] @@ -713,7 +724,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b35a8ce923c7490629d84e12fa2f75e1733f1ec692a47c264f9b7fd632855afc" dependencies = [ - "errno", + "errno 0.2.8", "libc", "log", "winapi", @@ -924,7 +935,7 @@ checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix", + "rustix 0.36.9", "windows-sys 0.45.0", ] @@ -985,6 +996,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + [[package]] name = "lock_api" version = "0.4.9" @@ -1208,7 +1225,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.45.0", ] @@ -1371,6 +1388,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -1378,7 +1404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] @@ -1479,10 +1505,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", + "io-lifetimes", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustix" +version = "0.37.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" +dependencies = [ + "bitflags", + "errno 0.3.0", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.1", "windows-sys 0.45.0", ] @@ -1790,15 +1830,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.42.0", + "redox_syscall 0.3.5", + "rustix 0.37.6", + "windows-sys 0.45.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 768dc62f..324608e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ retry = "2.0.0" serde_json = "1.0.95" strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" -tempfile = "3.4.0" +tempfile = "3.5.0" thiserror = "1.0.40" tokio = { version = "1.27.0", features = ["full"] } tokio-retry = "0.3.0" From 328762fb40b19c86dd171311783169d97fa2e1fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 22:03:42 +0000 Subject: [PATCH 021/133] build(deps): bump openssl from 0.10.48 to 0.10.49 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.48 to 0.10.49. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.48...openssl-v0.10.49) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 9 ++++----- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f433f363..73debdec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1148,9 +1148,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.48" +version = "0.10.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" +checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33" dependencies = [ "bitflags", "cfg-if", @@ -1189,11 +1189,10 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.83" +version = "0.9.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" +checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", diff --git a/Cargo.toml b/Cargo.toml index 324608e6..b61fa541 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ xz2 = "0.1.7" zip = "0.6.4" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.48", features = ["vendored"] } +openssl = { version = "0.10.49", features = ["vendored"] } [dev-dependencies] assert_cmd = "2.0.10" From 0aca435da09a174653d0e6edceed4cbc5067791e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 22:02:13 +0000 Subject: [PATCH 022/133] build(deps): bump openssl from 0.10.49 to 0.10.50 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.49 to 0.10.50. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.49...openssl-v0.10.50) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 73debdec..781ef636 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1148,9 +1148,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.49" +version = "0.10.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33" +checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" dependencies = [ "bitflags", "cfg-if", @@ -1189,9 +1189,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.84" +version = "0.9.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" +checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index b61fa541..a0ea22f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ xz2 = "0.1.7" zip = "0.6.4" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.49", features = ["vendored"] } +openssl = { version = "0.10.50", features = ["vendored"] } [dev-dependencies] assert_cmd = "2.0.10" From 6e4db431a70d331d37b7c22be7bda0dcb6113bb0 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Fri, 14 Apr 2023 14:20:41 +0200 Subject: [PATCH 023/133] Add support for generating shell completions (#223) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: ✨ Add support for shell completions * feat: 🔊 Add logs * docs: 📝 Add completions documentation * build: ⚡️ Remove cargo feature of clap * style: 🎨 Remove unnecesary clap args --- Cargo.lock | 10 ++++++++++ Cargo.toml | 1 + README.md | 28 ++++++++++++++++++++++++---- src/main.rs | 47 ++++++++++++++++++++++++++++++++++++++--------- 4 files changed, 73 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 781ef636..b25a5bfa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -292,6 +292,15 @@ dependencies = [ "strsim", ] +[[package]] +name = "clap_complete" +version = "4.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" +dependencies = [ + "clap", +] + [[package]] name = "clap_derive" version = "4.2.0" @@ -534,6 +543,7 @@ dependencies = [ "assert_fs", "async-trait", "clap", + "clap_complete", "console", "directories 5.0.0", "env_logger", diff --git a/Cargo.toml b/Cargo.toml index a0ea22f3..d4a6a378 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,7 @@ rust-version = "1.64" [dependencies] async-trait = "0.1.68" clap = { version = "4.2.0", features = ["derive"] } +clap_complete = "4.1.5" console = "0.15.5" directories = "5.0.0" env_logger = "0.10.0" diff --git a/README.md b/README.md index e971f8cd..043e8920 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,12 @@ It's also possible to use [cargo-binstall](https://github.com/cargo-bins/cargo-b See [Usage](#usage) section for more details. +### Completions + +``` +espup completions > /espup. +``` + ### Install ```sh @@ -98,15 +104,29 @@ espup update Usage: espup Commands: - install Installs Espressif Rust ecosystem - uninstall Uninstalls Espressif Rust ecosystem - update Updates Xtensa Rust toolchain - help Print this message or the help of the given subcommand(s) + completions Generate completions for the given shell + install Installs Espressif Rust ecosystem + uninstall Uninstalls Espressif Rust ecosystem + update Updates Xtensa Rust toolchain + help Print this message or the help of the given subcommand(s) Options: -h, --help Print help -V, --version Print version ``` +### Completions Subcommand + +``` +Usage: espup completions [OPTIONS] + +Arguments: + Shell to generate completions for [possible values: bash, elvish, fish, powershell, zsh] + +Options: + -l, --log-level Verbosity level of the logs [default: info] [possible values: debug, info, warn, error] + -h, --help Print help + -V, --version Print version +``` ### Install Subcommand diff --git a/src/main.rs b/src/main.rs index 902d3fbf..984d4244 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ -use clap::Parser; +use clap::{CommandFactory, Parser}; +use clap_complete::Shell; use directories::BaseDirs; use espup::{ emoji, @@ -34,14 +35,7 @@ const DEFAULT_EXPORT_FILE: &str = "export-esp.ps1"; const DEFAULT_EXPORT_FILE: &str = "export-esp.sh"; #[derive(Parser)] -#[command( - name = "espup", - bin_name = "espup", - version, - propagate_version = true, - about, - arg_required_else_help(true) -)] +#[command(about, version)] struct Cli { #[command(subcommand)] subcommand: SubCommand, @@ -49,6 +43,8 @@ struct Cli { #[derive(Parser)] pub enum SubCommand { + /// Generate completions for the given shell. + Completions(CompletionsOpts), /// Installs Espressif Rust ecosystem. // We use a Box here to make clippy happy (see https://rust-lang.github.io/rust-clippy/master/index.html#large_enum_variant) Install(Box), @@ -58,6 +54,15 @@ pub enum SubCommand { Update(UpdateOpts), } +#[derive(Debug, Parser)] +pub struct CompletionsOpts { + /// Verbosity level of the logs. + #[arg(short = 'l', long, default_value = "info", value_parser = ["debug", "info", "warn", "error"])] + pub log_level: String, + /// Shell to generate completions for. + pub shell: Shell, +} + #[derive(Debug, Parser)] pub struct InstallOpts { /// Target triple of the host. @@ -119,6 +124,29 @@ pub struct UninstallOpts { pub name: String, } +/// Updates Xtensa Rust toolchain. +async fn completions(args: CompletionsOpts) -> Result<()> { + initialize_logger(&args.log_level); + check_for_update(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")); + + info!( + "{} Generating completions for {} shell", + emoji::DISC, + args.shell + ); + + clap_complete::generate( + args.shell, + &mut Cli::command(), + "espup", + &mut std::io::stdout(), + ); + + info!("{} Completions successfully generated!", emoji::CHECK); + + Ok(()) +} + /// Installs the Rust for ESP chips environment async fn install(args: InstallOpts) -> Result<()> { initialize_logger(&args.log_level); @@ -305,6 +333,7 @@ async fn update(args: UpdateOpts) -> Result<()> { #[tokio::main] async fn main() -> Result<()> { match Cli::parse().subcommand { + SubCommand::Completions(args) => completions(args).await, SubCommand::Install(args) => install(*args).await, SubCommand::Update(args) => update(args).await, SubCommand::Uninstall(args) => uninstall(args).await, From 42bd1f7cbdc8c810510b3c619a702e7cd0d1924f Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Sat, 15 Apr 2023 12:15:13 +0200 Subject: [PATCH 024/133] =?UTF-8?q?ci:=20=E2=9A=A1=EF=B8=8F=20Remove=20unu?= =?UTF-8?q?sed=20matrix=20variable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 110fcf46..9d8453f4 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -25,7 +25,6 @@ jobs: binary-postfix: ".exe" - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu - cross: true - os: macos-latest target: aarch64-apple-darwin steps: From 1eee42e90437c5bdbb3571bb9f27d2bfcd1cc202 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 22:00:59 +0000 Subject: [PATCH 025/133] build(deps): bump assert_cmd from 2.0.10 to 2.0.11 Bumps [assert_cmd](https://github.com/assert-rs/assert_cmd) from 2.0.10 to 2.0.11. - [Release notes](https://github.com/assert-rs/assert_cmd/releases) - [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_cmd/compare/v2.0.10...v2.0.11) --- updated-dependencies: - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 22 ++++++++++++++-------- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b25a5bfa..05080353 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,7 +55,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" dependencies = [ - "anstyle", + "anstyle 0.3.5", "anstyle-parse", "anstyle-wincon", "concolor-override", @@ -70,6 +70,12 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + [[package]] name = "anstyle-parse" version = "0.1.1" @@ -85,17 +91,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" dependencies = [ - "anstyle", + "anstyle 0.3.5", "windows-sys 0.45.0", ] [[package]] name = "assert_cmd" -version = "2.0.10" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd" +checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" dependencies = [ - "anstyle", + "anstyle 1.0.0", "bstr", "doc-comment", "predicates", @@ -110,7 +116,7 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9d5bf7e5441c6393b5a9670a5036abe6b4847612f594b870f7332dbf10cf6fa" dependencies = [ - "anstyle", + "anstyle 0.3.5", "doc-comment", "globwalk", "predicates", @@ -286,7 +292,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" dependencies = [ "anstream", - "anstyle", + "anstyle 0.3.5", "bitflags", "clap_lex", "strsim", @@ -1318,7 +1324,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" dependencies = [ - "anstyle", + "anstyle 0.3.5", "difflib", "itertools", "predicates-core", diff --git a/Cargo.toml b/Cargo.toml index d4a6a378..8b2549da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ zip = "0.6.4" openssl = { version = "0.10.50", features = ["vendored"] } [dev-dependencies] -assert_cmd = "2.0.10" +assert_cmd = "2.0.11" assert_fs = "1.0.12" [package.metadata.binstall] From a49f0b63a8783941991826f510fe6b67e9fab78f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 06:38:58 +0000 Subject: [PATCH 026/133] build(deps): bump clap from 4.2.1 to 4.2.2 Bumps [clap](https://github.com/clap-rs/clap) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 150 ++++++++++++++++++++++++++++++++++++++--------------- Cargo.toml | 2 +- 2 files changed, 109 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05080353..2cfa7b77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,15 +51,15 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" dependencies = [ - "anstyle 0.3.5", + "anstyle 1.0.0", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", + "colorchoice", "is-terminal", "utf8parse", ] @@ -78,21 +78,30 @@ checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "anstyle-wincon" -version = "0.2.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" dependencies = [ - "anstyle 0.3.5", - "windows-sys 0.45.0", + "anstyle 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -276,9 +285,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" dependencies = [ "clap_builder", "clap_derive", @@ -287,12 +296,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" dependencies = [ "anstream", - "anstyle 0.3.5", + "anstyle 1.0.0", "bitflags", "clap_lex", "strsim", @@ -326,19 +335,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] -name = "concolor-override" +name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "console" @@ -2361,13 +2361,13 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", ] [[package]] @@ -2376,7 +2376,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -2385,13 +2394,28 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -2400,42 +2424,84 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "winnow" version = "0.3.5" diff --git a/Cargo.toml b/Cargo.toml index 8b2549da..7b894688 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.64" [dependencies] async-trait = "0.1.68" -clap = { version = "4.2.0", features = ["derive"] } +clap = { version = "4.2.2", features = ["derive"] } clap_complete = "4.1.5" console = "0.15.5" directories = "5.0.0" From 3ee27eac2611405ea24b4d2d54397dd859a3d177 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Wed, 19 Apr 2023 09:37:48 +0200 Subject: [PATCH 027/133] =?UTF-8?q?feat:=20=E2=9C=A8=20Add=20ESP32-H2=20su?= =?UTF-8?q?pport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- src/main.rs | 2 +- src/targets.rs | 15 +++++++++------ src/toolchain/gcc.rs | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 043e8920..f76791bd 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ Options: With this option, espup will skip GCC installation (it will be handled by esp-idf-sys), hence you won't be able to build no_std applications. -t, --targets - Comma or space separated list of targets [esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c6,all] + Comma or space separated list of targets [esp32,esp32c2,esp32c3,esp32c6,esp32h2,esp32s2,esp32s3,all] [default: all] diff --git a/src/main.rs b/src/main.rs index 984d4244..09d98897 100644 --- a/src/main.rs +++ b/src/main.rs @@ -90,7 +90,7 @@ pub struct InstallOpts { /// With this option, espup will skip GCC installation (it will be handled by esp-idf-sys), hence you won't be able to build no_std applications. #[arg(short = 's', long)] pub std: bool, - /// Comma or space separated list of targets [esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c6,all]. + /// Comma or space separated list of targets [esp32,esp32c2,esp32c3,esp32c6,esp32h2,esp32s2,esp32s3,all]. #[arg(short = 't', long, default_value = "all", value_parser = parse_targets)] pub targets: HashSet, /// Xtensa Rust toolchain version. diff --git a/src/targets.rs b/src/targets.rs index e19ccd7d..d82a60b8 100644 --- a/src/targets.rs +++ b/src/targets.rs @@ -11,16 +11,18 @@ use strum::{Display, EnumIter, EnumString, IntoEnumIterator}; pub enum Target { /// Xtensa LX6 based dual core ESP32 = 0, - /// Xtensa LX7 based single core - ESP32S2, - /// Xtensa LX7 based dual core - ESP32S3, /// RISC-V based single core ESP32C2, /// RISC-V based single core ESP32C3, /// RISC-V based single core ESP32C6, + /// RISC-V based single core + ESP32H2, + /// Xtensa LX7 based single core + ESP32S2, + /// Xtensa LX7 based dual core + ESP32S3, } impl Target { @@ -82,11 +84,12 @@ mod tests { )); let targets: HashSet = [ Target::ESP32, - Target::ESP32S2, - Target::ESP32S3, Target::ESP32C2, Target::ESP32C3, Target::ESP32C6, + Target::ESP32H2, + Target::ESP32S2, + Target::ESP32S3, ] .into_iter() .collect(); diff --git a/src/toolchain/gcc.rs b/src/toolchain/gcc.rs index 95b8e071..2a4c6fcf 100644 --- a/src/toolchain/gcc.rs +++ b/src/toolchain/gcc.rs @@ -163,7 +163,7 @@ pub fn get_gcc_name(target: &Target) -> String { Target::ESP32 => ESP32_GCC, Target::ESP32S2 => ESP32S2_GCC, Target::ESP32S3 => ESP32S3_GCC, - Target::ESP32C2 | Target::ESP32C3 | Target::ESP32C6 => RISCV_GCC, + Target::ESP32C2 | Target::ESP32C3 | Target::ESP32C6 | Target::ESP32H2 => RISCV_GCC, }; toolchain.to_string() } From f711fb125ba44ab5ed263d3717e8254559324a98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Apr 2023 07:39:54 +0000 Subject: [PATCH 028/133] build(deps): bump clap_complete from 4.1.5 to 4.2.0 Bumps [clap_complete](https://github.com/clap-rs/clap) from 4.1.5 to 4.2.0. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.1.5...clap_complete-v4.2.0) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2cfa7b77..f2def181 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -309,9 +309,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.1.5" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" +checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" dependencies = [ "clap", ] diff --git a/Cargo.toml b/Cargo.toml index 7b894688..32f9b685 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.64" [dependencies] async-trait = "0.1.68" clap = { version = "4.2.2", features = ["derive"] } -clap_complete = "4.1.5" +clap_complete = "4.2.0" console = "0.15.5" directories = "5.0.0" env_logger = "0.10.0" From 7e5319779a02a801e83eea61e6fe13671f0c6786 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 06:38:58 +0000 Subject: [PATCH 029/133] build(deps): bump assert_fs from 1.0.12 to 1.0.13 Bumps [assert_fs](https://github.com/assert-rs/assert_fs) from 1.0.12 to 1.0.13. - [Release notes](https://github.com/assert-rs/assert_fs/releases) - [Changelog](https://github.com/assert-rs/assert_fs/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_fs/compare/v1.0.12...v1.0.13) --- updated-dependencies: - dependency-name: assert_fs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f2def181..8c7233de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,11 +121,11 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d5bf7e5441c6393b5a9670a5036abe6b4847612f594b870f7332dbf10cf6fa" +checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" dependencies = [ - "anstyle 0.3.5", + "anstyle 1.0.0", "doc-comment", "globwalk", "predicates", diff --git a/Cargo.toml b/Cargo.toml index 32f9b685..0d3f28cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ openssl = { version = "0.10.50", features = ["vendored"] } [dev-dependencies] assert_cmd = "2.0.11" -assert_fs = "1.0.12" +assert_fs = "1.0.13" [package.metadata.binstall] bin-dir = "{ bin }{ binary-ext }" From 21d0bc7baa97a63932536bd0850405a53d40cb6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 22:01:40 +0000 Subject: [PATCH 030/133] build(deps): bump serde_json from 1.0.95 to 1.0.96 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.95 to 1.0.96. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.95...v1.0.96) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c7233de..06c0c5b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1650,9 +1650,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 0d3f28cb..6e4690be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ miette = { version = "5.7.0", features = ["fancy"] } regex = "1.7.3" reqwest = { version = "0.11.16", features = ["blocking"] } retry = "2.0.0" -serde_json = "1.0.95" +serde_json = "1.0.96" strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" tempfile = "3.5.0" From faf4bf0db2b0bb8af3d74f3d49cea86fb5d5cce8 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Mon, 24 Apr 2023 10:15:49 +0200 Subject: [PATCH 031/133] Fix Windows environment (#242) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: ✨ Add env mod and rework Windows environment setup * style: 🎨 Format includes * build: ⬆️ Bump version * fix: 🐛 Fix unix includes * docs: 📝 Add file docstring --- Cargo.lock | 15 +++- Cargo.toml | 5 +- src/env.rs | 167 ++++++++++++++++++++++++++++++++++++++++++ src/lib.rs | 1 + src/main.rs | 148 ++----------------------------------- src/toolchain/llvm.rs | 48 +++++------- 6 files changed, 207 insertions(+), 177 deletions(-) create mode 100644 src/env.rs diff --git a/Cargo.lock b/Cargo.lock index 06c0c5b8..7db1a078 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -543,7 +543,7 @@ dependencies = [ [[package]] name = "espup" -version = "0.3.3-dev" +version = "0.4.0-dev" dependencies = [ "assert_cmd", "assert_fs", @@ -570,6 +570,7 @@ dependencies = [ "tokio-retry", "toml", "update-informer", + "winreg 0.50.0", "xz2", "zip", ] @@ -1480,7 +1481,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -2520,6 +2521,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "xattr" version = "0.2.3" diff --git a/Cargo.toml b/Cargo.toml index 6e4690be..460f85de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espup" -version = "0.3.3-dev" +version = "0.4.0-dev" authors = ["Sergio Gasquez Arcos "] edition = "2021" license = "MIT OR Apache-2.0" @@ -42,6 +42,9 @@ zip = "0.6.4" [target.'cfg(unix)'.dependencies] openssl = { version = "0.10.50", features = ["vendored"] } +[target.'cfg(windows)'.dependencies] +winreg = "0.50.0" + [dev-dependencies] assert_cmd = "2.0.11" assert_fs = "1.0.13" diff --git a/src/env.rs b/src/env.rs new file mode 100644 index 00000000..f2177ad1 --- /dev/null +++ b/src/env.rs @@ -0,0 +1,167 @@ +//! Environment variables set up and export file support. + +use crate::{emoji, error::Error}; +use directories::BaseDirs; +use log::{info, warn}; +#[cfg(windows)] +use std::env; +use std::{ + fs::File, + io::Write, + path::{Path, PathBuf}, +}; +#[cfg(windows)] +use winreg::{ + enums::{HKEY_CURRENT_USER, KEY_READ, KEY_WRITE}, + RegKey, +}; + +#[cfg(windows)] +const DEFAULT_EXPORT_FILE: &str = "export-esp.ps1"; +#[cfg(not(windows))] +const DEFAULT_EXPORT_FILE: &str = "export-esp.sh"; + +#[cfg(windows)] +/// Sets an environment variable for the current user. +pub fn set_environment_variable(key: &str, value: &str) -> Result<(), Error> { + env::set_var(key, value); + + let hkcu = RegKey::predef(HKEY_CURRENT_USER); + let environment_key = hkcu.open_subkey_with_flags("Environment", KEY_WRITE)?; + environment_key.set_value(key, &value)?; + Ok(()) +} + +#[cfg(windows)] +/// Deletes an environment variable for the current user. +pub fn delete_environment_variable(key: &str) -> Result<(), Error> { + if env::var_os(key).is_none() { + return Ok(()); + } + + env::remove_var(key); + + let hkcu = RegKey::predef(HKEY_CURRENT_USER); + let environment_key = hkcu.open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)?; + environment_key.delete_value(key)?; + Ok(()) +} + +/// Returns the absolute path to the export file, uses the DEFAULT_EXPORT_FILE if no arg is provided. +pub fn get_export_file(export_file: Option) -> Result { + if let Some(export_file) = export_file { + if export_file.is_dir() { + return Err(Error::InvalidDestination(export_file.display().to_string())); + } + if export_file.is_absolute() { + Ok(export_file) + } else { + let current_dir = std::env::current_dir()?; + Ok(current_dir.join(export_file)) + } + } else { + Ok(BaseDirs::new() + .unwrap() + .home_dir() + .join(DEFAULT_EXPORT_FILE)) + } +} + +/// Creates the export file with the necessary environment variables. +pub fn create_export_file(export_file: &PathBuf, exports: &[String]) -> Result<(), Error> { + info!("{} Creating export file", emoji::WRENCH); + let mut file = File::create(export_file)?; + for e in exports.iter() { + #[cfg(windows)] + let e = e.replace('/', r#"\"#); + file.write_all(e.as_bytes())?; + file.write_all(b"\n")?; + } + + Ok(()) +} + +/// Instructions to export the environment variables. +pub fn export_environment(export_file: &Path) -> Result<(), Error> { + #[cfg(windows)] + if cfg!(windows) { + set_environment_variable("PATH", &env::var("PATH").unwrap())?; + warn!( + "{} Your environments variables have been updated! Shell may need to be restarted for changes to be effective.", + emoji::INFO + ); + warn!( + "{} A file was created at '{}' showing the injected environment variables.", + emoji::INFO, + export_file.display() + ); + } + #[cfg(unix)] + if cfg!(unix) { + warn!( + "{} Please, set up the environment variables by running: '. {}'", + emoji::INFO, + export_file.display() + ); + warn!( + "{} This step must be done every time you open a new terminal.", + emoji::WARN + ); + } + Ok(()) +} + +#[cfg(test)] +mod tests { + use crate::env::{create_export_file, get_export_file, DEFAULT_EXPORT_FILE}; + use directories::BaseDirs; + use std::{env::current_dir, path::PathBuf}; + + #[test] + #[allow(unused_variables)] + fn test_get_export_file() { + // No arg provided + let home_dir = BaseDirs::new().unwrap().home_dir().to_path_buf(); + let export_file = home_dir.join(DEFAULT_EXPORT_FILE); + assert!(matches!(get_export_file(None), Ok(export_file))); + // Relative path + let current_dir = current_dir().unwrap(); + let export_file = current_dir.join("export.sh"); + assert!(matches!( + get_export_file(Some(PathBuf::from("export.sh"))), + Ok(export_file) + )); + // Absolute path + let export_file = PathBuf::from("/home/user/export.sh"); + assert!(matches!( + get_export_file(Some(PathBuf::from("/home/user/export.sh"))), + Ok(export_file) + )); + // Path is a directory instead of a file + assert!(get_export_file(Some(home_dir)).is_err()); + } + + #[test] + fn test_create_export_file() { + // Creates the export file and writes the correct content to it + let temp_dir = tempfile::TempDir::new().unwrap(); + let export_file = temp_dir.path().join("export.sh"); + let exports = vec![ + "export VAR1=value1".to_string(), + "export VAR2=value2".to_string(), + ]; + create_export_file(&export_file, &exports).unwrap(); + let contents = std::fs::read_to_string(export_file).unwrap(); + assert_eq!(contents, "export VAR1=value1\nexport VAR2=value2\n"); + + // Returns the correct error when it fails to create the export file (it already exists) + let temp_dir = tempfile::TempDir::new().unwrap(); + let export_file = temp_dir.path().join("export.sh"); + std::fs::create_dir_all(&export_file).unwrap(); + let exports = vec![ + "export VAR1=value1".to_string(), + "export VAR2=value2".to_string(), + ]; + assert!(create_export_file(&export_file, &exports).is_err()); + } +} diff --git a/src/lib.rs b/src/lib.rs index 5f1b16b8..e4312115 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,5 @@ pub mod emoji; +pub mod env; pub mod error; pub mod host_triple; pub mod targets; diff --git a/src/main.rs b/src/main.rs index 09d98897..81ade276 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,10 @@ use clap::{CommandFactory, Parser}; use clap_complete::Shell; -use directories::BaseDirs; +#[cfg(windows)] +use espup::env::set_environment_variable; use espup::{ emoji, + env::{create_export_file, export_environment, get_export_file}, error::Error, host_triple::get_host_triple, logging::initialize_logger, @@ -17,23 +19,10 @@ use espup::{ }; use log::{debug, info, warn}; use miette::Result; -#[cfg(windows)] -use std::process::{Command, Stdio}; -use std::{ - collections::HashSet, - env, - fs::{remove_dir_all, File}, - io::Write, - path::{Path, PathBuf}, -}; +use std::{collections::HashSet, env, fs::remove_dir_all, path::PathBuf}; use tokio::sync::mpsc; use tokio_retry::{strategy::FixedInterval, Retry}; -#[cfg(windows)] -const DEFAULT_EXPORT_FILE: &str = "export-esp.ps1"; -#[cfg(not(windows))] -const DEFAULT_EXPORT_FILE: &str = "export-esp.sh"; - #[derive(Parser)] #[command(about, version)] struct Cli { @@ -286,12 +275,7 @@ async fn uninstall(args: UninstallOpts) -> Result<()> { .map_err(|_| Error::RemoveDirectory(install_path.display().to_string()))?; #[cfg(windows)] - if cfg!(windows) { - Command::new("setx") - .args(["PATH", &std::env::var("PATH").unwrap(), "/m"]) - .output() - .unwrap(); - } + set_environment_variable("PATH", &env::var("PATH").unwrap())?; info!("{} Uninstallation successfully completed!", emoji::CHECK); Ok(()) @@ -339,125 +323,3 @@ async fn main() -> Result<()> { SubCommand::Uninstall(args) => uninstall(args).await, } } - -/// Returns the absolute path to the export file, uses the DEFAULT_EXPORT_FILE if no arg is provided. -fn get_export_file(export_file: Option) -> Result { - if let Some(export_file) = export_file { - if export_file.is_dir() { - return Err(Error::InvalidDestination(export_file.display().to_string())); - } - if export_file.is_absolute() { - Ok(export_file) - } else { - let current_dir = std::env::current_dir()?; - Ok(current_dir.join(export_file)) - } - } else { - Ok(BaseDirs::new() - .unwrap() - .home_dir() - .join(DEFAULT_EXPORT_FILE)) - } -} - -/// Creates the export file with the necessary environment variables. -fn create_export_file(export_file: &PathBuf, exports: &[String]) -> Result<(), Error> { - info!("{} Creating export file", emoji::WRENCH); - let mut file = File::create(export_file)?; - for e in exports.iter() { - #[cfg(windows)] - let e = e.replace('/', r#"\"#); - file.write_all(e.as_bytes())?; - file.write_all(b"\n")?; - } - - Ok(()) -} - -/// Instructions to export the environment variables. -fn export_environment(export_file: &Path) -> Result<(), Error> { - #[cfg(windows)] - if cfg!(windows) { - Command::new("setx") - .args(["PATH", &env::var("PATH").unwrap(), "/m"]) - .stdout(Stdio::null()) - .output()?; - warn!( - "{} Your environments variables have been updated! Shell may need to be restarted for changes to be effective.", - emoji::INFO - ); - warn!( - "{} A file was created at '{}' showing the injected environment variables.", - emoji::INFO, - export_file.display() - ); - } - #[cfg(unix)] - if cfg!(unix) { - warn!( - "{} Please, set up the environment variables by running: '. {}'", - emoji::INFO, - export_file.display() - ); - warn!( - "{} This step must be done every time you open a new terminal.", - emoji::WARN - ); - } - Ok(()) -} - -#[cfg(test)] -mod tests { - use crate::{create_export_file, get_export_file, DEFAULT_EXPORT_FILE}; - use directories::BaseDirs; - use std::{env::current_dir, path::PathBuf}; - - #[test] - #[allow(unused_variables)] - fn test_get_export_file() { - // No arg provided - let home_dir = BaseDirs::new().unwrap().home_dir().to_path_buf(); - let export_file = home_dir.join(DEFAULT_EXPORT_FILE); - assert!(matches!(get_export_file(None), Ok(export_file))); - // Relative path - let current_dir = current_dir().unwrap(); - let export_file = current_dir.join("export.sh"); - assert!(matches!( - get_export_file(Some(PathBuf::from("export.sh"))), - Ok(export_file) - )); - // Absolute path - let export_file = PathBuf::from("/home/user/export.sh"); - assert!(matches!( - get_export_file(Some(PathBuf::from("/home/user/export.sh"))), - Ok(export_file) - )); - // Path is a directory instead of a file - assert!(get_export_file(Some(home_dir)).is_err()); - } - - #[test] - fn test_create_export_file() { - // Creates the export file and writes the correct content to it - let temp_dir = tempfile::TempDir::new().unwrap(); - let export_file = temp_dir.path().join("export.sh"); - let exports = vec![ - "export VAR1=value1".to_string(), - "export VAR2=value2".to_string(), - ]; - create_export_file(&export_file, &exports).unwrap(); - let contents = std::fs::read_to_string(export_file).unwrap(); - assert_eq!(contents, "export VAR1=value1\nexport VAR2=value2\n"); - - // Returns the correct error when it fails to create the export file (it already exists) - let temp_dir = tempfile::TempDir::new().unwrap(); - let export_file = temp_dir.path().join("export.sh"); - std::fs::create_dir_all(&export_file).unwrap(); - let exports = vec![ - "export VAR1=value1".to_string(), - "export VAR2=value2".to_string(), - ]; - assert!(create_export_file(&export_file, &exports).is_err()); - } -} diff --git a/src/toolchain/llvm.rs b/src/toolchain/llvm.rs index 1a5443d2..df81d561 100644 --- a/src/toolchain/llvm.rs +++ b/src/toolchain/llvm.rs @@ -1,5 +1,7 @@ //! LLVM Toolchain source and installation tools. +#[cfg(windows)] +use crate::env::{delete_environment_variable, set_environment_variable}; use crate::{ emoji, error::Error, @@ -9,8 +11,6 @@ use crate::{ use async_trait::async_trait; use log::{info, warn}; use miette::Result; -#[cfg(windows)] -use std::process::{Command, Stdio}; use std::{ fs::remove_dir_all, path::{Path, PathBuf}, @@ -101,25 +101,17 @@ impl Llvm { if llvm_path.exists() { #[cfg(windows)] if cfg!(windows) { - Command::new("setx") - .args(["LIBCLANG_PATH", "", "/m"]) - .stdout(Stdio::null()) - .output()?; - Command::new("setx") - .args(["CLANG_PATH", "", "/m"]) - .stdout(Stdio::null()) - .output()?; - std::env::set_var( - "PATH", - std::env::var("PATH").unwrap().replace( - &format!( - "{}\\{}\\esp-clang\\bin;", - llvm_path.display().to_string().replace('/', "\\"), - DEFAULT_LLVM_15_VERSION, - ), - "", + delete_environment_variable("LIBCLANG_PATH")?; + delete_environment_variable("CLANG_PATH")?; + let updated_path = std::env::var("PATH").unwrap().replace( + &format!( + "{}\\{}\\esp-clang\\bin;", + llvm_path.display().to_string().replace('/', "\\"), + DEFAULT_LLVM_15_VERSION, ), + "", ); + set_environment_variable("PATH", &updated_path)?; } remove_dir_all(toolchain_path.join(CLANG_NAME))?; } @@ -160,14 +152,11 @@ impl Installable for Llvm { "$Env:PATH = \"{};\" + $Env:PATH", self.get_lib_path() )); - Command::new("setx") - .args([ - "LIBCLANG_PATH", - &format!("{}\\libclang.dll", self.get_lib_path().replace('/', "\\")), - "/m", - ]) - .stdout(Stdio::null()) - .output()?; + set_environment_variable( + "LIBCLANG_PATH", + &format!("{}\\libclang.dll", self.get_lib_path().replace('/', "\\")), + )?; + std::env::set_var( "PATH", self.get_lib_path().replace('/', "\\") + ";" + &std::env::var("PATH").unwrap(), @@ -180,10 +169,7 @@ impl Installable for Llvm { #[cfg(windows)] if cfg!(windows) { exports.push(format!("$Env:CLANG_PATH = \"{}\"", self.get_bin_path())); - Command::new("setx") - .args(["CLANG_PATH", &self.get_bin_path().replace('/', "\\"), "/m"]) - .stdout(Stdio::null()) - .output()?; + set_environment_variable("CLANG_PATH", &self.get_bin_path().replace('/', "\\"))?; } #[cfg(unix)] exports.push(format!("export CLANG_PATH=\"{}\"", self.get_bin_path())); From 15ec5acf3ece733c301225d030f96d5eadda23f5 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Mon, 24 Apr 2023 10:54:41 +0200 Subject: [PATCH 032/133] Prepare release v0.4.0 (#243) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build: 📌 Pin version * build: ⬆️ Upgrade dependencies version --- Cargo.lock | 51 ++++++++++++++++++++++++++++++--------------------- Cargo.toml | 12 ++++++------ 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7db1a078..91851461 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,6 +49,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + [[package]] name = "anstream" version = "0.3.0" @@ -285,9 +294,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.2" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" +checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62" dependencies = [ "clap_builder", "clap_derive", @@ -296,9 +305,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.2" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" +checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" dependencies = [ "anstream", "anstyle 1.0.0", @@ -309,9 +318,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" +checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473" dependencies = [ "clap", ] @@ -543,7 +552,7 @@ dependencies = [ [[package]] name = "espup" -version = "0.4.0-dev" +version = "0.4.0" dependencies = [ "assert_cmd", "assert_fs", @@ -717,7 +726,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", @@ -1057,9 +1066,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "miette" -version = "5.7.0" +version = "5.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abdc09c381c9336b9f2e9bd6067a9a5290d20e2d2e2296f275456121c33ae89" +checksum = "92a992891d5579caa9efd8e601f82e30a1caa79a27a5db075dde30ecb9eab357" dependencies = [ "backtrace", "backtrace-ext", @@ -1078,9 +1087,9 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.7.0" +version = "5.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8842972f23939443013dfd3720f46772b743e86f1a81d120d4b6fb090f87de1c" +checksum = "4c65c625186a9bcce6699394bee511e1b1aec689aa7e3be1bf4e996e75834153" dependencies = [ "proc-macro2", "quote", @@ -1165,9 +1174,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.50" +version = "0.10.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" +checksum = "97ea2d98598bf9ada7ea6ee8a30fb74f9156b63bbe495d64ec2b87c269d2dda3" dependencies = [ "bitflags", "cfg-if", @@ -1206,9 +1215,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.85" +version = "0.9.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0" +checksum = "992bac49bdbab4423199c654a5515bd2a6c6a23bf03f2dd3bdb7e5ae6259bc69" dependencies = [ "cc", "libc", @@ -1426,11 +1435,11 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", "regex-syntax", ] @@ -1443,9 +1452,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "reqwest" diff --git a/Cargo.toml b/Cargo.toml index 460f85de..da2c48e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espup" -version = "0.4.0-dev" +version = "0.4.0" authors = ["Sergio Gasquez Arcos "] edition = "2021" license = "MIT OR Apache-2.0" @@ -15,16 +15,16 @@ rust-version = "1.64" [dependencies] async-trait = "0.1.68" -clap = { version = "4.2.2", features = ["derive"] } -clap_complete = "4.2.0" +clap = { version = "4.2.4", features = ["derive"] } +clap_complete = "4.2.1" console = "0.15.5" directories = "5.0.0" env_logger = "0.10.0" flate2 = "1.0.25" guess_host_triple = "0.1.3" log = "0.4.17" -miette = { version = "5.7.0", features = ["fancy"] } -regex = "1.7.3" +miette = { version = "5.8.0", features = ["fancy"] } +regex = "1.8.1" reqwest = { version = "0.11.16", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.96" @@ -40,7 +40,7 @@ xz2 = "0.1.7" zip = "0.6.4" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.50", features = ["vendored"] } +openssl = { version = "0.10.51", features = ["vendored"] } [target.'cfg(windows)'.dependencies] winreg = "0.50.0" From 516db069171f2b2903acd8ac349006885c788878 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 22:01:06 +0000 Subject: [PATCH 033/133] build(deps): bump directories from 5.0.0 to 5.0.1 Bumps [directories](https://github.com/soc/directories-rs) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/soc/directories-rs/releases) - [Commits](https://github.com/soc/directories-rs/commits) --- updated-dependencies: - dependency-name: directories dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 21 ++++++++++++++------- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91851461..9d7ee20d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -449,11 +449,11 @@ dependencies = [ [[package]] name = "directories" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74be3be809c18e089de43bdc504652bb2bc473fca8756131f8689db8cf079ba9" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ - "dirs-sys 0.4.0", + "dirs-sys 0.4.1", ] [[package]] @@ -469,13 +469,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -560,7 +561,7 @@ dependencies = [ "clap", "clap_complete", "console", - "directories 5.0.0", + "directories 5.0.1", "env_logger", "flate2", "guess_host_triple", @@ -1226,6 +1227,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "owo-colors" version = "3.5.0" diff --git a/Cargo.toml b/Cargo.toml index da2c48e1..a750b382 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ async-trait = "0.1.68" clap = { version = "4.2.4", features = ["derive"] } clap_complete = "4.2.1" console = "0.15.5" -directories = "5.0.0" +directories = "5.0.1" env_logger = "0.10.0" flate2 = "1.0.25" guess_host_triple = "0.1.3" From 62af5abee263944cc7269dacd42d3439eac52445 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 08:00:30 +0000 Subject: [PATCH 034/133] build(deps): bump flate2 from 1.0.25 to 1.0.26 Bumps [flate2](https://github.com/rust-lang/flate2-rs) from 1.0.25 to 1.0.26. - [Release notes](https://github.com/rust-lang/flate2-rs/releases) - [Commits](https://github.com/rust-lang/flate2-rs/commits) --- updated-dependencies: - dependency-name: flate2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 17 +++++++++++++---- Cargo.toml | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d7ee20d..abf47ec8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,7 +170,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.6.2", "object", "rustc-demangle", ] @@ -608,12 +608,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -1112,6 +1112,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.8.6" diff --git a/Cargo.toml b/Cargo.toml index a750b382..cf9156d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ clap_complete = "4.2.1" console = "0.15.5" directories = "5.0.1" env_logger = "0.10.0" -flate2 = "1.0.25" +flate2 = "1.0.26" guess_host_triple = "0.1.3" log = "0.4.17" miette = { version = "5.8.0", features = ["fancy"] } From 57325686ab8f5f7d18d17cb2f9ea883a4ce7fdbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 22:02:10 +0000 Subject: [PATCH 035/133] build(deps): bump reqwest from 0.11.16 to 0.11.17 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.16 to 0.11.17. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.16...v0.11.17) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index abf47ec8..f5f5b640 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1474,9 +1474,9 @@ checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "base64 0.21.0", "bytes", diff --git a/Cargo.toml b/Cargo.toml index cf9156d5..b139bd6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ guess_host_triple = "0.1.3" log = "0.4.17" miette = { version = "5.8.0", features = ["fancy"] } regex = "1.8.1" -reqwest = { version = "0.11.16", features = ["blocking"] } +reqwest = { version = "0.11.17", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.96" strum = { version = "0.24", features = ["derive"] } From bb2addf50f51d67b50705b8b44f84bf8d13a3631 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 22:02:30 +0000 Subject: [PATCH 036/133] build(deps): bump openssl from 0.10.51 to 0.10.52 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.51 to 0.10.52. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.51...openssl-v0.10.52) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f5f5b640..f6888702 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1184,9 +1184,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.51" +version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ea2d98598bf9ada7ea6ee8a30fb74f9156b63bbe495d64ec2b87c269d2dda3" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ "bitflags", "cfg-if", @@ -1225,9 +1225,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.86" +version = "0.9.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992bac49bdbab4423199c654a5515bd2a6c6a23bf03f2dd3bdb7e5ae6259bc69" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index b139bd6e..d6d420e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ xz2 = "0.1.7" zip = "0.6.4" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.51", features = ["vendored"] } +openssl = { version = "0.10.52", features = ["vendored"] } [target.'cfg(windows)'.dependencies] winreg = "0.50.0" From c2d97341a096f5481411b9deeeac9ac154fde929 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 22:01:33 +0000 Subject: [PATCH 037/133] build(deps): bump tokio from 1.27.0 to 1.28.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.27.0 to 1.28.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.27.0...tokio-1.28.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f6888702..485008e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1981,9 +1981,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" dependencies = [ "autocfg", "bytes", @@ -1995,14 +1995,14 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index d6d420e2..9d1a1baf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" tempfile = "3.5.0" thiserror = "1.0.40" -tokio = { version = "1.27.0", features = ["full"] } +tokio = { version = "1.28.0", features = ["full"] } tokio-retry = "0.3.0" toml = "0.7.3" update-informer = "0.6.0" From 3136d22cff5948456f1b5184a3fe8120a6e281cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 08:04:54 +0000 Subject: [PATCH 038/133] build(deps): bump clap from 4.2.4 to 4.2.5 Bumps [clap](https://github.com/clap-rs/clap) from 4.2.4 to 4.2.5. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.2.4...v4.2.5) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 485008e1..6a53c925 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -294,9 +294,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.4" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62" +checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819" dependencies = [ "clap_builder", "clap_derive", @@ -305,9 +305,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.4" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" +checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab" dependencies = [ "anstream", "anstyle 1.0.0", diff --git a/Cargo.toml b/Cargo.toml index 9d1a1baf..3e24548b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.64" [dependencies] async-trait = "0.1.68" -clap = { version = "4.2.4", features = ["derive"] } +clap = { version = "4.2.5", features = ["derive"] } clap_complete = "4.2.1" console = "0.15.5" directories = "5.0.1" From d5043ba2163f2bbb44414871b082a767641041d7 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Wed, 10 May 2023 15:37:34 +0200 Subject: [PATCH 039/133] =?UTF-8?q?build:=20=E2=AC=86=EF=B8=8F=20Cargo=20u?= =?UTF-8?q?pdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 378 +++++++++++++++++++++++++---------------------------- 1 file changed, 176 insertions(+), 202 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a53c925..ef5195b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,11 +60,11 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ - "anstyle 1.0.0", + "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", @@ -73,12 +73,6 @@ dependencies = [ "utf8parse", ] -[[package]] -name = "anstyle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" - [[package]] name = "anstyle" version = "1.0.0" @@ -105,11 +99,11 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ - "anstyle 1.0.0", + "anstyle", "windows-sys 0.48.0", ] @@ -119,7 +113,7 @@ version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" dependencies = [ - "anstyle 1.0.0", + "anstyle", "bstr", "doc-comment", "predicates", @@ -134,7 +128,7 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" dependencies = [ - "anstyle 1.0.0", + "anstyle", "doc-comment", "globwalk", "predicates", @@ -151,7 +145,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -219,9 +213,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "once_cell", @@ -231,9 +225,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "byteorder" @@ -294,9 +288,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.5" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ "clap_builder", "clap_derive", @@ -305,12 +299,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.5" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", - "anstyle 1.0.0", + "anstyle", "bitflags", "clap_lex", "strsim", @@ -318,9 +312,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473" +checksum = "36774babb166352bb4f7b9cb16f781ffa3439d2a8f12cd31bea85a38c888fea3" dependencies = [ "clap", ] @@ -334,7 +328,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -380,15 +374,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -532,13 +526,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -596,14 +590,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", "redox_syscall 0.2.16", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -648,42 +642,42 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-io", @@ -696,9 +690,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -706,9 +700,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -759,9 +753,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.16" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -857,9 +851,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -921,9 +915,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -940,30 +934,31 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix 0.36.9", - "windows-sys 0.45.0", + "rustix", + "windows-sys 0.48.0", ] [[package]] @@ -998,9 +993,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" dependencies = [ "wasm-bindgen", ] @@ -1013,21 +1008,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "lock_api" @@ -1094,14 +1083,14 @@ checksum = "4c65c625186a9bcce6699394bee511e1b1aec689aa7e3be1bf4e996e75834153" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" @@ -1199,13 +1188,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -1216,9 +1205,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.1+1.1.1t" +version = "111.25.3+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10" +checksum = "924757a6a226bf60da5f7dd0311a34d2b52283dd82ddeb103208ddc66362f80c" dependencies = [ "cc", ] @@ -1334,9 +1323,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "ppv-lite86" @@ -1346,11 +1335,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.0.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" dependencies = [ - "anstyle 0.3.5", + "anstyle", "difflib", "itertools", "predicates-core", @@ -1364,9 +1353,9 @@ checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -1374,18 +1363,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5308e8208729c3e1504a6cfad0d5daacc4614c9a2e65d1ea312a34b5cb00fe84" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -1535,36 +1524,22 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.36.9" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", - "errno 0.2.8", + "errno 0.3.1", "io-lifetimes", "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.37.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" -dependencies = [ - "bitflags", - "errno 0.3.0", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.1", - "windows-sys 0.45.0", + "linux-raw-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1656,22 +1631,22 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.155" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f2b4817415c6d4210bfe1c7bfcf4801b2d904cb4d0e1a8fdb651013c9e86b8" +checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.155" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d071a94a3fac4aff69d023a7f411e33f40f3483f8c5190b1953822b6b76d7630" +checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -1820,9 +1795,9 @@ dependencies = [ [[package]] name = "supports-hyperlinks" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4806e0b03b9906e76b018a5d821ebf198c8e9dc0829ed3328eeeb5094aed60" +checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" dependencies = [ "is-terminal", ] @@ -1849,9 +1824,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.11" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -1878,7 +1853,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.6", + "rustix", "windows-sys 0.45.0", ] @@ -1903,9 +1878,9 @@ dependencies = [ [[package]] name = "termtree" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "textwrap" @@ -1935,7 +1910,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -1950,9 +1925,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "serde", "time-core", @@ -1960,9 +1935,9 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "tinyvec" @@ -1981,9 +1956,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes", @@ -2006,7 +1981,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -2032,9 +2007,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -2067,9 +2042,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.6" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", "serde", @@ -2118,9 +2093,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-bidi" -version = "0.3.11" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -2230,12 +2205,11 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -2257,9 +2231,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2267,24 +2241,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" dependencies = [ "cfg-if", "js-sys", @@ -2294,9 +2268,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2304,28 +2278,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" dependencies = [ "js-sys", "wasm-bindgen", @@ -2387,13 +2361,13 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -2402,7 +2376,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets 0.42.1", + "windows-targets 0.42.2", ] [[package]] @@ -2416,17 +2390,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -2446,9 +2420,9 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" @@ -2458,9 +2432,9 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" @@ -2470,9 +2444,9 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" @@ -2482,9 +2456,9 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" @@ -2494,9 +2468,9 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" @@ -2506,9 +2480,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" @@ -2518,9 +2492,9 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" @@ -2530,9 +2504,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.3.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] @@ -2576,9 +2550,9 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" dependencies = [ "aes", "byteorder", @@ -2615,9 +2589,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", From c42c242ba565454a24752dc77e8528a82dfb82fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 22:01:37 +0000 Subject: [PATCH 040/133] build(deps): bump update-informer from 0.6.0 to 1.0.0 Bumps [update-informer](https://github.com/mgrachev/update-informer) from 0.6.0 to 1.0.0. - [Release notes](https://github.com/mgrachev/update-informer/releases) - [Changelog](https://github.com/mgrachev/update-informer/blob/main/CHANGELOG.md) - [Commits](https://github.com/mgrachev/update-informer/compare/v0.6.0...v1.0.0) --- updated-dependencies: - dependency-name: update-informer dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 30 +++++------------------------- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ef5195b3..d5b5b429 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -432,33 +432,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "directories" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" -dependencies = [ - "dirs-sys 0.3.7", -] - [[package]] name = "directories" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", + "dirs-sys", ] [[package]] @@ -555,7 +535,7 @@ dependencies = [ "clap", "clap_complete", "console", - "directories 5.0.1", + "directories", "env_logger", "flate2", "guess_host_triple", @@ -2136,11 +2116,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "update-informer" -version = "0.6.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152ff185ca29f7f487c51ca785b0f1d85970c4581f4cdd12ed499227890200f5" +checksum = "19d952f24d9cd8b7564d22c7b2cde3429c48b50c6f4e72b07b382ae4ee5f21b3" dependencies = [ - "directories 4.0.1", + "directories", "semver", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 3e24548b..7ccf4df1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ thiserror = "1.0.40" tokio = { version = "1.28.0", features = ["full"] } tokio-retry = "0.3.0" toml = "0.7.3" -update-informer = "0.6.0" +update-informer = "1.0.0" xz2 = "0.1.7" zip = "0.6.4" From 8f1ce3c50c559ef12beb3a61f9fdcd23168f816c Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Wed, 10 May 2023 15:51:02 +0200 Subject: [PATCH 041/133] =?UTF-8?q?build:=20=E2=AC=86=EF=B8=8F=20Bump=20MS?= =?UTF-8?q?RV=20to=201.65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yaml | 2 +- Cargo.toml | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ee2842e5..da717cbe 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -82,7 +82,7 @@ jobs: - name: Setup Rust toolchain uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.64.0 + toolchain: 1.65.0 - name: Enable caching uses: Swatinem/rust-cache@v2 - name: Cargo check diff --git a/Cargo.toml b/Cargo.toml index 7ccf4df1..f01faf1a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ Tool for installing and maintaining Espressif Rust ecosystem. """ keywords = ["esp", "esp-rs", "embedded", "cli", "xtensa"] categories = ["command-line-utilities", "development-tools", "embedded"] -rust-version = "1.64" +rust-version = "1.65" [dependencies] async-trait = "0.1.68" diff --git a/README.md b/README.md index f76791bd..8c14c25e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # espup [![Crates.io](https://img.shields.io/crates/v/espup.svg)](https://crates.io/crates/espup) -![MSRV](https://img.shields.io/badge/MSRV-1.64-blue?labelColor=1C2C2E&logo=Rust&style=flat-square) +![MSRV](https://img.shields.io/badge/MSRV-1.65-blue?labelColor=1C2C2E&logo=Rust&style=flat-square) [![Continuous Integration](https://github.com/esp-rs/espup/actions/workflows/ci.yaml/badge.svg)](https://github.com/esp-rs/espup/actions/workflows/ci.yaml) [![Security audit](https://github.com/esp-rs/espup/actions/workflows/audit.yaml/badge.svg)](https://github.com/esp-rs/espup/actions/workflows/audit.yaml) [![Matrix](https://img.shields.io/matrix/esp-rs:matrix.org?label=join%20matrix&color=BEC5C9&labelColor=1C2C2E&logo=matrix&style=flat-square)](https://matrix.to/#/#esp-rs:matrix.org) From 79fa60b73b298ec49e62aae1d2706d77b4cff4bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 22:00:21 +0000 Subject: [PATCH 042/133] build(deps): bump clap_complete from 4.2.2 to 4.2.3 Bumps [clap_complete](https://github.com/clap-rs/clap) from 4.2.2 to 4.2.3. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.2.2...clap_complete-v4.2.3) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5b5b429..57baf417 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -312,9 +312,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.2.2" +version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36774babb166352bb4f7b9cb16f781ffa3439d2a8f12cd31bea85a38c888fea3" +checksum = "1594fe2312ec4abf402076e407628f5c313e54c32ade058521df4ee34ecac8a8" dependencies = [ "clap", ] diff --git a/Cargo.toml b/Cargo.toml index f01faf1a..c846d794 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.68" clap = { version = "4.2.5", features = ["derive"] } -clap_complete = "4.2.1" +clap_complete = "4.2.3" console = "0.15.5" directories = "5.0.1" env_logger = "0.10.0" From 80ae98ab0e69d15b7c3715499fa389842f221af8 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Thu, 18 May 2023 10:43:18 +0200 Subject: [PATCH 043/133] Update LLVM and GCC (#256) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: ✨ Add support for LLVM 16 * feat: ✨ Add support for GCC 12 * feat: ✨ Update LLVM release * style: 🎨 Avoid having RELEASE and VERSION consts * feat: 🎨 Update target methdos name * feat: 🐛 Fix LLVM versions --- src/main.rs | 28 +++++++++++++++--------- src/targets.rs | 6 +++--- src/toolchain/gcc.rs | 50 ++++++++++++++++--------------------------- src/toolchain/llvm.rs | 27 +++++++++++++++++++++-- src/toolchain/rust.rs | 2 +- 5 files changed, 65 insertions(+), 48 deletions(-) diff --git a/src/main.rs b/src/main.rs index 81ade276..cd8f9f8e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -146,20 +146,28 @@ async fn install(args: InstallOpts) -> Result<()> { let export_file = get_export_file(args.export_file)?; let mut exports: Vec = Vec::new(); let host_triple = get_host_triple(args.default_host)?; + let xtensa_rust_version = if let Some(toolchain_version) = &args.toolchain_version { + toolchain_version.clone() + } else { + XtensaRust::get_latest_version().await? + }; let install_path = get_rustup_home().join("toolchains").join(args.name); - let llvm = Llvm::new(&install_path, &host_triple, args.extended_llvm)?; + let llvm: Llvm = Llvm::new( + &install_path, + &host_triple, + args.extended_llvm, + &xtensa_rust_version, + )?; let targets = args.targets; let xtensa_rust = if targets.contains(&Target::ESP32) || targets.contains(&Target::ESP32S2) || targets.contains(&Target::ESP32S3) { - let xtensa_rust: XtensaRust = if let Some(toolchain_version) = &args.toolchain_version { - XtensaRust::new(toolchain_version, &host_triple, &install_path) - } else { - let latest_version = XtensaRust::get_latest_version().await?; - XtensaRust::new(&latest_version, &host_triple, &install_path) - }; - Some(xtensa_rust) + Some(XtensaRust::new( + &xtensa_rust_version, + &host_triple, + &install_path, + )) } else { None }; @@ -197,14 +205,14 @@ async fn install(args: InstallOpts) -> Result<()> { to_install.push(Box::new(llvm)); - if targets.iter().any(|t| t.riscv()) { + if targets.iter().any(|t| t.is_riscv()) { let riscv_target = RiscVTarget::new(&args.nightly_version); to_install.push(Box::new(riscv_target)); } if !args.std { targets.iter().for_each(|target| { - if target.xtensa() { + if target.is_xtensa() { let gcc = Gcc::new(target, &host_triple, &install_path); to_install.push(Box::new(gcc)); } diff --git a/src/targets.rs b/src/targets.rs index d82a60b8..7bdf0c36 100644 --- a/src/targets.rs +++ b/src/targets.rs @@ -27,12 +27,12 @@ pub enum Target { impl Target { /// Returns true if the target is a RISC-V based chip. - pub fn riscv(&self) -> bool { - !self.xtensa() + pub fn is_riscv(&self) -> bool { + !self.is_xtensa() } /// Returns true if the target is a Xtensa based chip. - pub fn xtensa(&self) -> bool { + pub fn is_xtensa(&self) -> bool { matches!(self, Target::ESP32 | Target::ESP32S2 | Target::ESP32S3) } } diff --git a/src/toolchain/gcc.rs b/src/toolchain/gcc.rs index 2a4c6fcf..69fa907a 100644 --- a/src/toolchain/gcc.rs +++ b/src/toolchain/gcc.rs @@ -16,8 +16,7 @@ use std::{ }; const DEFAULT_GCC_REPOSITORY: &str = "https://github.com/espressif/crosstool-NG/releases/download"; -const DEFAULT_GCC_RELEASE: &str = "esp-2021r2-patch5"; -const DEFAULT_GCC_VERSION: &str = "8_4_0"; +const DEFAULT_GCC_RELEASE: &str = "12.2.0_20230208"; pub const ESP32_GCC: &str = "xtensa-esp32-elf"; pub const ESP32S2_GCC: &str = "xtensa-esp32s2-elf"; pub const ESP32S3_GCC: &str = "xtensa-esp32s3-elf"; @@ -29,14 +28,8 @@ pub struct Gcc { pub host_triple: HostTriple, /// GCC Toolchain name. pub name: String, - /// Repository release version to use. - pub release: String, - /// The repository containing GCC sources. - pub repository_url: String, /// GCC Toolchain path. pub path: PathBuf, - /// GCC Version. - pub version: String, } impl Gcc { @@ -48,38 +41,28 @@ impl Gcc { /// Create a new instance with default values and proper toolchain name. pub fn new(target: &Target, host_triple: &HostTriple, toolchain_path: &Path) -> Self { let name = get_gcc_name(target); - let version = DEFAULT_GCC_VERSION.to_string(); - let release = DEFAULT_GCC_RELEASE.to_string(); let path = toolchain_path .join(&name) - .join(format!("{release}-{version}")); + .join(format!("esp-{DEFAULT_GCC_RELEASE}")); Self { host_triple: host_triple.clone(), name, - release, - repository_url: DEFAULT_GCC_REPOSITORY.to_string(), path, - version, } } /// Create a new instance of RISC-V GCC with default values and proper toolchain name. pub fn new_riscv(host_triple: &HostTriple, toolchain_path: &Path) -> Self { - let version = DEFAULT_GCC_VERSION.to_string(); - let release = DEFAULT_GCC_RELEASE.to_string(); let name = RISCV_GCC.to_string(); let path = toolchain_path .join(&name) - .join(format!("{release}-{version}")); + .join(format!("esp-{DEFAULT_GCC_RELEASE}")); Self { host_triple: host_triple.clone(), name, - release, - repository_url: DEFAULT_GCC_REPOSITORY.to_string(), path, - version, } } } @@ -97,14 +80,16 @@ impl Installable for Gcc { ); } else { let gcc_file = format!( - "{}-gcc{}-{}-{}.{}", + "{}-{}-{}.{}", self.name, - self.version, - self.release, + DEFAULT_GCC_RELEASE, get_arch(&self.host_triple).unwrap(), extension ); - let gcc_dist_url = format!("{}/{}/{}", self.repository_url, self.release, gcc_file); + let gcc_dist_url = format!( + "{}/esp-{}/{}", + DEFAULT_GCC_REPOSITORY, DEFAULT_GCC_RELEASE, gcc_file + ); download_file( gcc_dist_url, &format!("{}.{}", &self.name, extension), @@ -141,11 +126,13 @@ impl Installable for Gcc { /// Gets the name of the GCC arch based on the host triple. fn get_arch(host_triple: &HostTriple) -> Result<&str> { match host_triple { - HostTriple::X86_64AppleDarwin => Ok("macos"), - HostTriple::Aarch64AppleDarwin => Ok("macos-arm64"), - HostTriple::X86_64UnknownLinuxGnu => Ok("linux-amd64"), - HostTriple::Aarch64UnknownLinuxGnu => Ok("linux-arm64"), - HostTriple::X86_64PcWindowsMsvc | HostTriple::X86_64PcWindowsGnu => Ok("win64"), + HostTriple::X86_64AppleDarwin => Ok("x86_64-apple-darwin"), + HostTriple::Aarch64AppleDarwin => Ok("aarch64-apple-darwin"), + HostTriple::X86_64UnknownLinuxGnu => Ok("x86_64-linux-gnu"), + HostTriple::Aarch64UnknownLinuxGnu => Ok("aarch64-linux-gnu"), + HostTriple::X86_64PcWindowsMsvc | HostTriple::X86_64PcWindowsGnu => { + Ok("x86_64-w64-mingw32") + } } } @@ -153,7 +140,7 @@ fn get_arch(host_triple: &HostTriple) -> Result<&str> { fn get_artifact_extension(host_triple: &HostTriple) -> &str { match host_triple { HostTriple::X86_64PcWindowsMsvc | HostTriple::X86_64PcWindowsGnu => "zip", - _ => "tar.gz", + _ => "tar.xz", } } @@ -180,10 +167,9 @@ pub fn uninstall_gcc_toolchains(toolchain_path: &Path) -> Result<(), Error> { #[cfg(windows)] if cfg!(windows) { let gcc_path = format!( - "{}\\{}-{}\\{}\\bin", + "{}\\esp-{}\\{}\\bin", gcc_path.display(), DEFAULT_GCC_RELEASE, - DEFAULT_GCC_VERSION, toolchain ); std::env::set_var( diff --git a/src/toolchain/llvm.rs b/src/toolchain/llvm.rs index df81d561..34155cc4 100644 --- a/src/toolchain/llvm.rs +++ b/src/toolchain/llvm.rs @@ -6,18 +6,21 @@ use crate::{ emoji, error::Error, host_triple::HostTriple, - toolchain::{download_file, Installable}, + toolchain::{download_file, rust::RE_EXTENDED_SEMANTIC_VERSION, Installable}, }; use async_trait::async_trait; use log::{info, warn}; use miette::Result; +use regex::Regex; use std::{ fs::remove_dir_all, path::{Path, PathBuf}, + u8, }; const DEFAULT_LLVM_REPOSITORY: &str = "https://github.com/espressif/llvm-project/releases/download"; const DEFAULT_LLVM_15_VERSION: &str = "esp-15.0.0-20221201"; +const DEFAULT_LLVM_16_VERSION: &str = "esp-16.0.0-20230516"; pub const CLANG_NAME: &str = "xtensa-esp32-elf-clang"; #[derive(Debug, Clone, Default)] @@ -71,8 +74,28 @@ impl Llvm { toolchain_path: &Path, host_triple: &HostTriple, extended: bool, + xtensa_rust_version: &str, ) -> Result { - let version = DEFAULT_LLVM_15_VERSION.to_string(); + let re_extended: Regex = Regex::new(RE_EXTENDED_SEMANTIC_VERSION).unwrap(); + let (major, minor, patch, subpatch) = match re_extended.captures(xtensa_rust_version) { + Some(version) => ( + version.get(1).unwrap().as_str().parse::().unwrap(), + version.get(2).unwrap().as_str().parse::().unwrap(), + version.get(3).unwrap().as_str().parse::().unwrap(), + version.get(4).unwrap().as_str().parse::().unwrap(), + ), + None => return Err(Error::InvalidVersion(xtensa_rust_version.to_string())), + }; + + // Use LLVM 15 for versions 1.69.0.0 and below + let version = if (major == 1 && minor == 69 && patch == 0 && subpatch == 0) + || (major == 1 && minor < 69) + { + DEFAULT_LLVM_15_VERSION.to_string() + } else { + DEFAULT_LLVM_16_VERSION.to_string() + }; + let mut file_name = format!( "llvm-{}-{}.tar.xz", version, diff --git a/src/toolchain/rust.rs b/src/toolchain/rust.rs index a5e33391..996a728e 100644 --- a/src/toolchain/rust.rs +++ b/src/toolchain/rust.rs @@ -34,7 +34,7 @@ const XTENSA_RUST_LATEST_API_URL: &str = const XTENSA_RUST_API_URL: &str = "https://api.github.com/repos/esp-rs/rust-build/releases"; /// Xtensa Rust Toolchain version regex. -const RE_EXTENDED_SEMANTIC_VERSION: &str = r"^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)?$"; +pub const RE_EXTENDED_SEMANTIC_VERSION: &str = r"^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)?$"; const RE_SEMANTIC_VERSION: &str = r"^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)?$"; From 5fd6173a020837e251beee861405e3f2c6b4ee9a Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 18 May 2023 11:05:00 +0200 Subject: [PATCH 044/133] =?UTF-8?q?build:=20=E2=AC=86=EF=B8=8F=20Update=20?= =?UTF-8?q?dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 127 +++++++++++++++++++++++++++-------------------------- Cargo.toml | 8 ++-- 2 files changed, 69 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 57baf417..ad0781d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,14 +19,13 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] @@ -145,7 +144,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -279,11 +278,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] @@ -328,7 +328,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -733,9 +733,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -903,6 +903,15 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.12" @@ -973,9 +982,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -1063,7 +1072,7 @@ checksum = "4c65c625186a9bcce6699394bee511e1b1aec689aa7e3be1bf4e996e75834153" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1145,12 +1154,6 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl" version = "0.10.52" @@ -1174,7 +1177,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1271,22 +1274,22 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -1343,9 +1346,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] @@ -1443,9 +1446,9 @@ checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "base64 0.21.0", "bytes", @@ -1582,9 +1585,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" dependencies = [ "bitflags", "core-foundation", @@ -1595,9 +1598,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -1611,22 +1614,22 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.162" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.162" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1804,9 +1807,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -1890,7 +1893,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1961,7 +1964,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2052,9 +2055,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -2211,9 +2214,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2221,24 +2224,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.35" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -2248,9 +2251,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2258,28 +2261,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" -version = "0.3.62" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -2530,9 +2533,9 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index c846d794..144c8ba6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.68" -clap = { version = "4.2.5", features = ["derive"] } +clap = { version = "4.2.7", features = ["derive"] } clap_complete = "4.2.3" console = "0.15.5" directories = "5.0.1" @@ -25,19 +25,19 @@ guess_host_triple = "0.1.3" log = "0.4.17" miette = { version = "5.8.0", features = ["fancy"] } regex = "1.8.1" -reqwest = { version = "0.11.17", features = ["blocking"] } +reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.96" strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" tempfile = "3.5.0" thiserror = "1.0.40" -tokio = { version = "1.28.0", features = ["full"] } +tokio = { version = "1.28.1", features = ["full"] } tokio-retry = "0.3.0" toml = "0.7.3" update-informer = "1.0.0" xz2 = "0.1.7" -zip = "0.6.4" +zip = "0.6.6" [target.'cfg(unix)'.dependencies] openssl = { version = "0.10.52", features = ["vendored"] } From ae578449b3836c97a3b98967bc3e8055b91eaa23 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 18 May 2023 11:10:06 +0200 Subject: [PATCH 045/133] =?UTF-8?q?build:=20=E2=AC=86=EF=B8=8F=20Bump=20ve?= =?UTF-8?q?rsion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad0781d2..1b4748ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -527,7 +527,7 @@ dependencies = [ [[package]] name = "espup" -version = "0.4.0" +version = "0.4.1" dependencies = [ "assert_cmd", "assert_fs", diff --git a/Cargo.toml b/Cargo.toml index 144c8ba6..c76e2c67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espup" -version = "0.4.0" +version = "0.4.1" authors = ["Sergio Gasquez Arcos "] edition = "2021" license = "MIT OR Apache-2.0" From e077b1b648c83f6a660a56e408972d29cff54049 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 22 May 2023 11:08:16 +0200 Subject: [PATCH 046/133] =?UTF-8?q?build:=20=E2=9E=96=20Remove=20unused=20?= =?UTF-8?q?dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 150 +---------------------------------------------------- Cargo.toml | 2 - README.md | 4 +- 3 files changed, 4 insertions(+), 152 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b4748ff..afc8a18e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,15 +39,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "1.0.1" @@ -121,21 +112,6 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "assert_fs" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" -dependencies = [ - "anstyle", - "doc-comment", - "globwalk", - "predicates", - "predicates-core", - "predicates-tree", - "tempfile", -] - [[package]] name = "async-trait" version = "0.1.68" @@ -530,7 +506,6 @@ name = "espup" version = "0.4.1" dependencies = [ "assert_cmd", - "assert_fs", "async-trait", "clap", "clap_complete", @@ -552,7 +527,6 @@ dependencies = [ "thiserror", "tokio", "tokio-retry", - "toml", "update-informer", "winreg 0.50.0", "xz2", @@ -695,30 +669,6 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick 0.7.20", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "globwalk" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" -dependencies = [ - "bitflags", - "ignore", - "walkdir", -] - [[package]] name = "guess_host_triple" version = "0.1.3" @@ -876,23 +826,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -1427,7 +1360,7 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", "regex-syntax", ] @@ -1549,15 +1482,6 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schannel" version = "0.1.21" @@ -1643,15 +1567,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1896,16 +1811,6 @@ dependencies = [ "syn 2.0.16", ] -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - [[package]] name = "time" version = "0.3.21" @@ -2002,40 +1907,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "tower-service" version = "0.3.2" @@ -2186,16 +2057,6 @@ dependencies = [ "libc", ] -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.0" @@ -2485,15 +2346,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -[[package]] -name = "winnow" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" -dependencies = [ - "memchr", -] - [[package]] name = "winreg" version = "0.10.1" diff --git a/Cargo.toml b/Cargo.toml index c76e2c67..0412b30d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,6 @@ tempfile = "3.5.0" thiserror = "1.0.40" tokio = { version = "1.28.1", features = ["full"] } tokio-retry = "0.3.0" -toml = "0.7.3" update-informer = "1.0.0" xz2 = "0.1.7" zip = "0.6.6" @@ -47,7 +46,6 @@ winreg = "0.50.0" [dev-dependencies] assert_cmd = "2.0.11" -assert_fs = "1.0.13" [package.metadata.binstall] bin-dir = "{ bin }{ binary-ext }" diff --git a/README.md b/README.md index 8c14c25e..d8ec124d 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,9 @@ To better understand what `espup` installs, see [`Rust on ESP targets` chapter o ## Requirements -Before running or installing `espup`, make sure that [`rustup`](https://rustup.rs/) is installed. Linux systems also require the following packages: +Before running or installing `espup`, make sure that [`rustup`](https://rustup.rs/) is installed. + +Linux systems also require the following packages: - Ubuntu/Debian ```sh sudo apt-get install -y gcc build-essential curl pkg-config From a50b9ca3a0dba82849c7470069d4e6a5c2578d21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 22:02:06 +0000 Subject: [PATCH 047/133] build(deps): bump miette from 5.8.0 to 5.9.0 Bumps [miette](https://github.com/zkat/miette) from 5.8.0 to 5.9.0. - [Release notes](https://github.com/zkat/miette/releases) - [Changelog](https://github.com/zkat/miette/blob/main/CHANGELOG.md) - [Commits](https://github.com/zkat/miette/compare/miette-derive-v5.8.0...miette-derive-v5.9.0) --- updated-dependencies: - dependency-name: miette dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index afc8a18e..a059a917 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -978,9 +978,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "miette" -version = "5.8.0" +version = "5.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a992891d5579caa9efd8e601f82e30a1caa79a27a5db075dde30ecb9eab357" +checksum = "a236ff270093b0b67451bc50a509bd1bad302cb1d3c7d37d5efe931238581fa9" dependencies = [ "backtrace", "backtrace-ext", @@ -999,9 +999,9 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.8.0" +version = "5.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c65c625186a9bcce6699394bee511e1b1aec689aa7e3be1bf4e996e75834153" +checksum = "4901771e1d44ddb37964565c654a3223ba41a594d02b8da471cc4464912b5cfa" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 0412b30d..98108f99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ env_logger = "0.10.0" flate2 = "1.0.26" guess_host_triple = "0.1.3" log = "0.4.17" -miette = { version = "5.8.0", features = ["fancy"] } +miette = { version = "5.9.0", features = ["fancy"] } regex = "1.8.1" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" From bbc37584ebe53adb267098eebac232f34a05076a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 22:01:37 +0000 Subject: [PATCH 048/133] build(deps): bump clap_complete from 4.2.3 to 4.3.0 Bumps [clap_complete](https://github.com/clap-rs/clap) from 4.2.3 to 4.3.0. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.2.3...clap_complete-v4.3.0) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a059a917..7e68cfad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -288,9 +288,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.2.3" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1594fe2312ec4abf402076e407628f5c313e54c32ade058521df4ee34ecac8a8" +checksum = "a04ddfaacc3bc9e6ea67d024575fafc2a813027cf374b8f24f7bc233c6b6be12" dependencies = [ "clap", ] diff --git a/Cargo.toml b/Cargo.toml index 98108f99..790456dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.68" clap = { version = "4.2.7", features = ["derive"] } -clap_complete = "4.2.3" +clap_complete = "4.3.0" console = "0.15.5" directories = "5.0.1" env_logger = "0.10.0" From e27490b35d5a9da6374db01184bd025900ef3247 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 07:32:56 +0000 Subject: [PATCH 049/133] build(deps): bump clap from 4.2.7 to 4.3.0 Bumps [clap](https://github.com/clap-rs/clap) from 4.2.7 to 4.3.0. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.2.7...clap_complete-v4.3.0) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7e68cfad..8191761d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.7" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" dependencies = [ "clap_builder", "clap_derive", @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" dependencies = [ "anstream", "anstyle", @@ -297,9 +297,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" dependencies = [ "heck", "proc-macro2", @@ -309,9 +309,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "colorchoice" diff --git a/Cargo.toml b/Cargo.toml index 790456dd..5a90a76c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.68" -clap = { version = "4.2.7", features = ["derive"] } +clap = { version = "4.3.0", features = ["derive"] } clap_complete = "4.3.0" console = "0.15.5" directories = "5.0.1" From b46e88cb3f82747617a6a0b7453cae812cb6ad90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 07:28:46 +0000 Subject: [PATCH 050/133] build(deps): bump regex from 1.8.1 to 1.8.2 Bumps [regex](https://github.com/rust-lang/regex) from 1.8.1 to 1.8.2. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.8.1...1.8.2) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8191761d..47cc666a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1356,9 +1356,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" dependencies = [ "aho-corasick", "memchr", @@ -1373,9 +1373,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "reqwest" diff --git a/Cargo.toml b/Cargo.toml index 5a90a76c..043a13f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ flate2 = "1.0.26" guess_host_triple = "0.1.3" log = "0.4.17" miette = { version = "5.9.0", features = ["fancy"] } -regex = "1.8.1" +regex = "1.8.2" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.96" From 2bdf86cf2b900af647c6cd2d66ded23db3ac448b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 07:32:57 +0000 Subject: [PATCH 051/133] build(deps): bump console from 0.15.5 to 0.15.7 Bumps [console](https://github.com/console-rs/console) from 0.15.5 to 0.15.7. - [Changelog](https://github.com/console-rs/console/blob/master/CHANGELOG.md) - [Commits](https://github.com/console-rs/console/compare/0.15.5...0.15.7) --- updated-dependencies: - dependency-name: console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47cc666a..ab7645a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -321,15 +321,15 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "console" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 043a13f6..33295937 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.65" async-trait = "0.1.68" clap = { version = "4.3.0", features = ["derive"] } clap_complete = "4.3.0" -console = "0.15.5" +console = "0.15.7" directories = "5.0.1" env_logger = "0.10.0" flate2 = "1.0.26" From 71c7e3efeede42cb47f3d1120494a2a40a511604 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 21:59:36 +0000 Subject: [PATCH 052/133] build(deps): bump log from 0.4.17 to 0.4.18 Bumps [log](https://github.com/rust-lang/log) from 0.4.17 to 0.4.18. - [Release notes](https://github.com/rust-lang/log/releases) - [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/log/compare/0.4.17...0.4.18) --- updated-dependencies: - dependency-name: log dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 7 ++----- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab7645a4..416f06fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -952,12 +952,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "lzma-sys" diff --git a/Cargo.toml b/Cargo.toml index 33295937..f550796e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ directories = "5.0.1" env_logger = "0.10.0" flate2 = "1.0.26" guess_host_triple = "0.1.3" -log = "0.4.17" +log = "0.4.18" miette = { version = "5.9.0", features = ["fancy"] } regex = "1.8.2" reqwest = { version = "0.11.18", features = ["blocking"] } From b46e7de0ccab0e5a538de6f404cb0984dfe4ebeb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 22:00:42 +0000 Subject: [PATCH 053/133] build(deps): bump tokio from 1.28.1 to 1.28.2 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.28.1...tokio-1.28.2) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 416f06fe..856c1e75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1841,9 +1841,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", diff --git a/Cargo.toml b/Cargo.toml index f550796e..6c63676d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" tempfile = "3.5.0" thiserror = "1.0.40" -tokio = { version = "1.28.1", features = ["full"] } +tokio = { version = "1.28.2", features = ["full"] } tokio-retry = "0.3.0" update-informer = "1.0.0" xz2 = "0.1.7" From 9d01bbdc09af2a44fd181c865317e8882d796d69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 21:59:57 +0000 Subject: [PATCH 054/133] build(deps): bump regex from 1.8.2 to 1.8.3 Bumps [regex](https://github.com/rust-lang/regex) from 1.8.2 to 1.8.3. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.8.2...1.8.3) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 856c1e75..2761f42d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1353,9 +1353,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", diff --git a/Cargo.toml b/Cargo.toml index 6c63676d..6667c5b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ flate2 = "1.0.26" guess_host_triple = "0.1.3" log = "0.4.18" miette = { version = "5.9.0", features = ["fancy"] } -regex = "1.8.2" +regex = "1.8.3" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.96" From d5cf4e9338ef5a982e30276aa32c8b84dd723c9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 21:59:54 +0000 Subject: [PATCH 055/133] build(deps): bump clap from 4.3.0 to 4.3.2 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.0 to 4.3.2. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.3.0...v4.3.2) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2761f42d..d75f81b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "401a4694d2bf92537b6867d94de48c4842089645fdcdf6c71865b175d836e9c2" dependencies = [ "clap_builder", "clap_derive", @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" dependencies = [ "anstream", "anstyle", @@ -297,9 +297,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ "heck", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 6667c5b0..ac452878 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.68" -clap = { version = "4.3.0", features = ["derive"] } +clap = { version = "4.3.2", features = ["derive"] } clap_complete = "4.3.0" console = "0.15.7" directories = "5.0.1" From 45191fdba4d237077347ab56c22f966775450943 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 21:59:36 +0000 Subject: [PATCH 056/133] build(deps): bump openssl from 0.10.52 to 0.10.54 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.52 to 0.10.54. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.52...openssl-v0.10.54) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d75f81b4..ed92918d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1086,9 +1086,9 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" dependencies = [ "bitflags", "cfg-if", @@ -1127,9 +1127,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index ac452878..6411c8f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ xz2 = "0.1.7" zip = "0.6.6" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.52", features = ["vendored"] } +openssl = { version = "0.10.54", features = ["vendored"] } [target.'cfg(windows)'.dependencies] winreg = "0.50.0" From c8b5fd2ec39607d0e4b410258882271e7380dc67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 21:59:03 +0000 Subject: [PATCH 057/133] build(deps): bump regex from 1.8.3 to 1.8.4 Bumps [regex](https://github.com/rust-lang/regex) from 1.8.3 to 1.8.4. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.8.3...1.8.4) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed92918d..f342ba1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1353,9 +1353,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.3" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", diff --git a/Cargo.toml b/Cargo.toml index 6411c8f1..6cff930e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ flate2 = "1.0.26" guess_host_triple = "0.1.3" log = "0.4.18" miette = { version = "5.9.0", features = ["fancy"] } -regex = "1.8.3" +regex = "1.8.4" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.96" From 8dbb8315e852d6152d7b6d6ae9202a607a5c1e82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 06:55:15 +0000 Subject: [PATCH 058/133] build(deps): bump clap_complete from 4.3.0 to 4.3.1 Bumps [clap_complete](https://github.com/clap-rs/clap) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.3.0...clap_complete-v4.3.1) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f342ba1a..029c878e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -288,9 +288,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a04ddfaacc3bc9e6ea67d024575fafc2a813027cf374b8f24f7bc233c6b6be12" +checksum = "7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b" dependencies = [ "clap", ] diff --git a/Cargo.toml b/Cargo.toml index 6cff930e..b91251f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.68" clap = { version = "4.3.2", features = ["derive"] } -clap_complete = "4.3.0" +clap_complete = "4.3.1" console = "0.15.7" directories = "5.0.1" env_logger = "0.10.0" From 557cb8f0d9ca0d36563885dc502988aea409e008 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Wed, 7 Jun 2023 11:48:36 +0200 Subject: [PATCH 059/133] =?UTF-8?q?docs:=20=F0=9F=93=9D=20Update=20readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index d8ec124d..e76a8499 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,12 @@ Linux systems also require the following packages: cargo install espup ``` -It's also possible to use [cargo-binstall](https://github.com/cargo-bins/cargo-binstall) or to directly download the pre-compiled [release binaries](https://github.com/esp-rs/espup/releases): +It's also possible to use [cargo-binstall](https://github.com/cargo-bins/cargo-binstall) or to directly download the pre-compiled [release binaries](https://github.com/esp-rs/espup/releases). + +
+ +Commands to install pre-compiled release binaries + - Linux aarch64 ```sh curl -L https://github.com/esp-rs/espup/releases/latest/download/espup-aarch64-unknown-linux-gnu -o espup @@ -64,18 +69,12 @@ It's also possible to use [cargo-binstall](https://github.com/cargo-bins/cargo-b Invoke-WebRequest 'https://github.com/esp-rs/espup/releases/latest/download/espup-x86_64-pc-windows-msvc.exe' -OutFile .\espup.exe ``` +
+ ## Quickstart See [Usage](#usage) section for more details. -### Completions - -``` -espup completions > /espup. -``` - -### Install - ```sh espup install # Unix @@ -87,19 +86,6 @@ espup install > > The generated export file, by default `export-esp`, needs to be sourced in every terminal in Unix systems before building an application. On Windows, environment variables are automatically injected into your system and don't need to be sourced. - -### Uninstall - -```sh -espup uninstall -``` - -### Update - -```sh -espup update -``` - ## Usage ``` @@ -127,7 +113,6 @@ Arguments: Options: -l, --log-level Verbosity level of the logs [default: info] [possible values: debug, info, warn, error] -h, --help Print help - -V, --version Print version ``` ### Install Subcommand @@ -190,9 +175,6 @@ Options: -h, --help Print help (see a summary with '-h') - - -V, --version - Print version ``` ### Uninstall Subcommand @@ -201,10 +183,9 @@ Options: Usage: espup uninstall [OPTIONS] Options: - -l, --log-level Verbosity level of the logs [default: info] [possible values: debug, info, warn, error] - -a, --name Xtensa Rust toolchain name [default: esp] - -h, --help Print help - -V, --version Print version + -l, --log-level Verbosity level of the logs [default: info] [possible values: debug, info, warn, error] + -a, --name Xtensa Rust toolchain name [default: esp] + -h, --help Print help ``` ### Update Subcommand @@ -223,8 +204,6 @@ Options: Xtensa Rust toolchain version -h, --help Print help - -V, --version - Print version ``` ## License From 5419b24ab1e30ae009e02bc3f275aa1d36cefc8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:59:59 +0000 Subject: [PATCH 060/133] build(deps): bump log from 0.4.18 to 0.4.19 Bumps [log](https://github.com/rust-lang/log) from 0.4.18 to 0.4.19. - [Release notes](https://github.com/rust-lang/log/releases) - [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/log/compare/0.4.18...0.4.19) --- updated-dependencies: - dependency-name: log dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 029c878e..c08b1fdf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -952,9 +952,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lzma-sys" diff --git a/Cargo.toml b/Cargo.toml index b91251f5..e5cb9f39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ directories = "5.0.1" env_logger = "0.10.0" flate2 = "1.0.26" guess_host_triple = "0.1.3" -log = "0.4.18" +log = "0.4.19" miette = { version = "5.9.0", features = ["fancy"] } regex = "1.8.4" reqwest = { version = "0.11.18", features = ["blocking"] } From df4f7c57d547ab8df981e158144cbc2777b8e6cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:59:40 +0000 Subject: [PATCH 061/133] build(deps): bump clap from 4.3.2 to 4.3.3 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.2 to 4.3.3. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.2...v4.3.3) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c08b1fdf..d792e2e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401a4694d2bf92537b6867d94de48c4842089645fdcdf6c71865b175d836e9c2" +checksum = "ca8f255e4b8027970e78db75e78831229c9815fdbfa67eb1a1b777a62e24b4a0" dependencies = [ "clap_builder", "clap_derive", @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.1" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" +checksum = "acd4f3c17c83b0ba34ffbc4f8bbd74f079413f747f84a6f89292f138057e36ab" dependencies = [ "anstream", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index e5cb9f39..e0cf5754 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.68" -clap = { version = "4.3.2", features = ["derive"] } +clap = { version = "4.3.3", features = ["derive"] } clap_complete = "4.3.1" console = "0.15.7" directories = "5.0.1" From c9e73c4cf4147c662b085deabd3fedb0feaf580c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:59:17 +0000 Subject: [PATCH 062/133] build(deps): bump tempfile from 3.5.0 to 3.6.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.5.0 to 3.6.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.5.0...v3.6.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 7 ++++--- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d792e2e2..7de6af24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1741,15 +1741,16 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index e0cf5754..89f04c73 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ retry = "2.0.0" serde_json = "1.0.96" strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" -tempfile = "3.5.0" +tempfile = "3.6.0" thiserror = "1.0.40" tokio = { version = "1.28.2", features = ["full"] } tokio-retry = "0.3.0" From 80538b1c598e26640280a5738eecaaebedfcb08d Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 2 Jun 2023 14:12:05 +0000 Subject: [PATCH 063/133] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Use=20the=20prope?= =?UTF-8?q?r=20toolchain=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/toolchain/rust.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/toolchain/rust.rs b/src/toolchain/rust.rs index 996a728e..06410366 100644 --- a/src/toolchain/rust.rs +++ b/src/toolchain/rust.rs @@ -189,12 +189,11 @@ impl Installable for XtensaRust { .stdout(Stdio::piped()) .output()?; let output = String::from_utf8_lossy(&rustc_version.stdout); - let toolchain_semver = self.version.rsplit_once('.').unwrap().0; - if rustc_version.status.success() && output.contains(toolchain_semver) { + if rustc_version.status.success() && output.contains(&self.version) { warn!( "{} Previous installation of Xtensa Rust {} exists in: '{}'. Reusing this installation.", emoji::WARN, - toolchain_semver, + &self.version, &self.toolchain_destination.display() ); return Ok(vec![]); From e922366d8669ca14ed3517dc5070045b2ca74f7e Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Thu, 22 Jun 2023 13:27:05 +0200 Subject: [PATCH 064/133] Create issue_handler.yml --- .github/workflows/issue_handler.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/issue_handler.yml diff --git a/.github/workflows/issue_handler.yml b/.github/workflows/issue_handler.yml new file mode 100644 index 00000000..978e8042 --- /dev/null +++ b/.github/workflows/issue_handler.yml @@ -0,0 +1,16 @@ +name: Add new issues to project + +on: + issues: + types: + - opened + +jobs: + add-to-project: + name: Add issue to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/esp-rs/projects/2 + github-token: ${{ secrets.PAT }} From 9dc867e605f00b8aece446032bd998d3a87f03f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:59:39 +0000 Subject: [PATCH 065/133] build(deps): bump serde_json from 1.0.96 to 1.0.99 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.96 to 1.0.99. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.96...v1.0.99) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7de6af24..e5fa8ddd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1555,9 +1555,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 89f04c73..eb07dea1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ miette = { version = "5.9.0", features = ["fancy"] } regex = "1.8.4" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" -serde_json = "1.0.96" +serde_json = "1.0.99" strum = { version = "0.24", features = ["derive"] } tar = "0.4.38" tempfile = "3.6.0" From 99c824474dad3b61e6985a8017b282518aa705fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:59:17 +0000 Subject: [PATCH 066/133] build(deps): bump clap from 4.3.3 to 4.3.8 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.3 to 4.3.8. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.3...v4.3.8) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5fa8ddd..3a1bfddf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.3" +version = "4.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8f255e4b8027970e78db75e78831229c9815fdbfa67eb1a1b777a62e24b4a0" +checksum = "d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211" dependencies = [ "clap_builder", "clap_derive", @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.3" +version = "4.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd4f3c17c83b0ba34ffbc4f8bbd74f079413f747f84a6f89292f138057e36ab" +checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717" dependencies = [ "anstream", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index eb07dea1..8db157e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.68" -clap = { version = "4.3.3", features = ["derive"] } +clap = { version = "4.3.8", features = ["derive"] } clap_complete = "4.3.1" console = "0.15.7" directories = "5.0.1" From bf7845e213906fe067d83758c2dafad4a601f1af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:59:27 +0000 Subject: [PATCH 067/133] build(deps): bump openssl from 0.10.54 to 0.10.55 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.54 to 0.10.55. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.54...openssl-v0.10.55) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a1bfddf..f43eb338 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1086,9 +1086,9 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.54" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags", "cfg-if", @@ -1127,9 +1127,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.88" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 8db157e0..302d6461 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ xz2 = "0.1.7" zip = "0.6.6" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.54", features = ["vendored"] } +openssl = { version = "0.10.55", features = ["vendored"] } [target.'cfg(windows)'.dependencies] winreg = "0.50.0" From 1a10ddcb845382b550e46df2e1c14cc554483d29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 06:56:26 +0000 Subject: [PATCH 068/133] build(deps): bump strum from 0.24.1 to 0.25.0 Bumps [strum](https://github.com/Peternator7/strum) from 0.24.1 to 0.25.0. - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/commits) --- updated-dependencies: - dependency-name: strum dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 41 +++++++++++++++-------------------------- Cargo.toml | 2 +- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f43eb338..5628bf8f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,7 +120,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -304,7 +304,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -1002,7 +1002,7 @@ checksum = "4901771e1d44ddb37964565c654a3223ba41a594d02b8da471cc4464912b5cfa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -1107,7 +1107,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -1219,7 +1219,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -1550,7 +1550,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -1652,24 +1652,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "fe9f3bd7d2e45dcc5e265fbb88d6513e4747d8ef9444cf01a533119bce28a157" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn", ] [[package]] @@ -1706,17 +1706,6 @@ dependencies = [ "is-terminal", ] -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.16" @@ -1806,7 +1795,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -1867,7 +1856,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -2092,7 +2081,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn", "wasm-bindgen-shared", ] @@ -2126,7 +2115,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index 302d6461..1f7157e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ regex = "1.8.4" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.99" -strum = { version = "0.24", features = ["derive"] } +strum = { version = "0.25", features = ["derive"] } tar = "0.4.38" tempfile = "3.6.0" thiserror = "1.0.40" From 1c7a486bf137a4f3ff9796f45c89c06e22c9e2d6 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Wed, 28 Jun 2023 13:19:43 +0200 Subject: [PATCH 069/133] Update readme (#289) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: 📝 Update readme * docs: Udpate readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e76a8499..c6c4a627 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ `espup` is a tool for installing and maintaining the required toolchains for developing applications in Rust for Espressif SoC's. -To better understand what `espup` installs, see [`Rust on ESP targets` chapter of `The Rust on ESP Book`](https://esp-rs.github.io/book/installation/index.html) +To better understand what `espup` installs, see [the installation chapter of `The Rust on ESP Book`](https://esp-rs.github.io/book/installation/index.html) ## Requirements @@ -26,7 +26,7 @@ Linux systems also require the following packages: ```sh sudo dnf -y install perl gcc ``` - - `perl` is required to build openssl-sys + - `perl` is required to build `openssl-sys` - openSUSE Thumbleweed/Leap ``` sudo zypper install -y gcc ninja make @@ -125,7 +125,7 @@ Options: > **Note** > > #### GitHub API -> During the installation, we do a few GitHub queries, [which has some limits](https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting). Our number of queries should not hit the limits unless you are running `espup install` command numerous times in a short span of time. We recommend setting the [`GITHUB_TOKEN` environment variable](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret) when using `espup` in CI, if you want to use `espup` on CI, recommend using it via the [`xtensa-toolchain` action](https://github.com/esp-rs/xtensa-toolchain/), and making sure `GITHUB_TOKEN` is not set when using it on a host machine. See https://github.com/esp-rs/xtensa-toolchain/issues/15 for more details on this. +> During the installation process, several GitHub queries are made, [which are subject to certain limits](https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting). Our number of queries should not hit the limits unless you are running `espup install` command numerous times in a short span of time. We recommend setting the [`GITHUB_TOKEN` environment variable](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret) when using `espup` in CI, if you want to use `espup` on CI, recommend using it via the [`xtensa-toolchain` action](https://github.com/esp-rs/xtensa-toolchain/), and making sure `GITHUB_TOKEN` is not set when using it on a host machine. See https://github.com/esp-rs/xtensa-toolchain/issues/15 for more details on this. ``` Usage: espup install [OPTIONS] From c00fdd9195b72b5fb8bd2d8c8bf3acf61229362d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:16:25 +0200 Subject: [PATCH 070/133] build(deps): bump tokio from 1.28.2 to 1.29.1 (#290) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.28.2 to 1.29.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.28.2...tokio-1.29.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 9 +++++---- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5628bf8f..b8f2e51e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -930,9 +930,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" @@ -1831,11 +1831,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", diff --git a/Cargo.toml b/Cargo.toml index 1f7157e0..58e9e832 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ strum = { version = "0.25", features = ["derive"] } tar = "0.4.38" tempfile = "3.6.0" thiserror = "1.0.40" -tokio = { version = "1.28.2", features = ["full"] } +tokio = { version = "1.29.1", features = ["full"] } tokio-retry = "0.3.0" update-informer = "1.0.0" xz2 = "0.1.7" From 7ede9ba4256b445c3c08f11f305e59827b47ff7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:16:41 +0200 Subject: [PATCH 071/133] build(deps): bump async-trait from 0.1.68 to 0.1.69 (#291) Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.68 to 0.1.69. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.68...0.1.69) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8f2e51e..64d08e9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 58e9e832..c88be9dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ categories = ["command-line-utilities", "development-tools", "embedded"] rust-version = "1.65" [dependencies] -async-trait = "0.1.68" +async-trait = "0.1.69" clap = { version = "4.3.8", features = ["derive"] } clap_complete = "4.3.1" console = "0.15.7" From 7b3091e57bb564c33ed52b981fe5baa4e87e5496 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:16:55 +0200 Subject: [PATCH 072/133] build(deps): bump update-informer from 1.0.0 to 1.1.0 (#292) Bumps [update-informer](https://github.com/mgrachev/update-informer) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/mgrachev/update-informer/releases) - [Changelog](https://github.com/mgrachev/update-informer/blob/main/CHANGELOG.md) - [Commits](https://github.com/mgrachev/update-informer/compare/v1.0.0...v1.1.0) --- updated-dependencies: - dependency-name: update-informer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++--- Cargo.toml | 2 +- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 64d08e9e..420cd460 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -803,6 +803,19 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +dependencies = [ + "http", + "hyper", + "rustls 0.21.2", + "tokio", + "tokio-rustls", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -1389,6 +1402,7 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -1398,16 +1412,20 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls 0.21.2", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots", "winreg 0.10.1", ] @@ -1467,6 +1485,37 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.12" @@ -1881,6 +1930,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.2", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.8" @@ -1978,11 +2037,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "update-informer" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d952f24d9cd8b7564d22c7b2cde3429c48b50c6f4e72b07b382ae4ee5f21b3" +checksum = "2f8811797a24ff123db3c6e1087aa42551d03d772b3724be421ad063da1f5f3f" dependencies = [ "directories", + "reqwest", "semver", "serde", "serde_json", @@ -1999,7 +2059,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls", + "rustls 0.20.8", "serde", "serde_json", "url", diff --git a/Cargo.toml b/Cargo.toml index c88be9dc..7704d399 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ tempfile = "3.6.0" thiserror = "1.0.40" tokio = { version = "1.29.1", features = ["full"] } tokio-retry = "0.3.0" -update-informer = "1.0.0" +update-informer = "1.1.0" xz2 = "0.1.7" zip = "0.6.6" From 26c748ff66188270c2bcd70dadf03c4d9903c650 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:51:15 +0200 Subject: [PATCH 073/133] build(deps): bump clap from 4.3.8 to 4.3.10 (#293) Bumps [clap](https://github.com/clap-rs/clap) from 4.3.8 to 4.3.10. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.8...v4.3.10) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 9 ++++----- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 420cd460..bcf4b13e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.8" +version = "4.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211" +checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" dependencies = [ "clap_builder", "clap_derive", @@ -275,13 +275,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.8" +version = "4.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717" +checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] diff --git a/Cargo.toml b/Cargo.toml index 7704d399..e3232e48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.69" -clap = { version = "4.3.8", features = ["derive"] } +clap = { version = "4.3.10", features = ["derive"] } clap_complete = "4.3.1" console = "0.15.7" directories = "5.0.1" From 91047d3dbd98e7c48a34c0d146ee4ae68eb8215d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:25:40 +0000 Subject: [PATCH 074/133] build(deps): bump clap from 4.3.10 to 4.3.11 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.10 to 4.3.11. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.10...v4.3.11) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bcf4b13e..020da0b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.10" +version = "4.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" +checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" dependencies = [ "clap_builder", "clap_derive", @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.10" +version = "4.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" dependencies = [ "anstream", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index e3232e48..e7b803ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.69" -clap = { version = "4.3.10", features = ["derive"] } +clap = { version = "4.3.11", features = ["derive"] } clap_complete = "4.3.1" console = "0.15.7" directories = "5.0.1" From 56c491dcad537146bd3d561fc6f567932de95b72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:25:28 +0000 Subject: [PATCH 075/133] build(deps): bump serde_json from 1.0.99 to 1.0.100 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.99 to 1.0.100. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.99...v1.0.100) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 020da0b2..765ab7b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1288,18 +1288,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.27" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -1583,18 +1583,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", @@ -1603,9 +1603,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" dependencies = [ "itoa", "ryu", @@ -1756,9 +1756,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index e7b803ce..dbfed77d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ miette = { version = "5.9.0", features = ["fancy"] } regex = "1.8.4" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" -serde_json = "1.0.99" +serde_json = "1.0.100" strum = { version = "0.25", features = ["derive"] } tar = "0.4.38" tempfile = "3.6.0" From c99bef832dc4e97e3def908ca06bafce7e904097 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 07:02:04 +0000 Subject: [PATCH 076/133] build(deps): bump async-trait from 0.1.69 to 0.1.71 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.69 to 0.1.71. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.69...0.1.71) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 765ab7b7..4afd695a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.69" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index dbfed77d..09c8b4fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ categories = ["command-line-utilities", "development-tools", "embedded"] rust-version = "1.65" [dependencies] -async-trait = "0.1.69" +async-trait = "0.1.71" clap = { version = "4.3.11", features = ["derive"] } clap_complete = "4.3.1" console = "0.15.7" From 2dcd54ceb2e1a0e4d6f93658d6b924da818eda88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 07:02:32 +0000 Subject: [PATCH 077/133] build(deps): bump clap_complete from 4.3.1 to 4.3.2 Bumps [clap_complete](https://github.com/clap-rs/clap) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.3.1...clap_complete-v4.3.2) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4afd695a..5750ef9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -287,9 +287,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.3.1" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b" +checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" dependencies = [ "clap", ] diff --git a/Cargo.toml b/Cargo.toml index 09c8b4fc..83d2600d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.71" clap = { version = "4.3.11", features = ["derive"] } -clap_complete = "4.3.1" +clap_complete = "4.3.2" console = "0.15.7" directories = "5.0.1" env_logger = "0.10.0" From 7e7bc615d6b4de338a4314ef9a6de2f9effc3e34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 07:02:54 +0000 Subject: [PATCH 078/133] build(deps): bump regex from 1.8.4 to 1.9.1 Bumps [regex](https://github.com/rust-lang/regex) from 1.8.4 to 1.9.1. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.8.4...1.9.1) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 22 +++++++++++++++++----- Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5750ef9d..b5b13e10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -194,7 +194,7 @@ checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "once_cell", - "regex-automata", + "regex-automata 0.1.10", "serde", ] @@ -1365,12 +1365,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", + "regex-automata 0.3.2", "regex-syntax", ] @@ -1380,11 +1381,22 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +[[package]] +name = "regex-automata" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" diff --git a/Cargo.toml b/Cargo.toml index 83d2600d..f5303a9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ flate2 = "1.0.26" guess_host_triple = "0.1.3" log = "0.4.19" miette = { version = "5.9.0", features = ["fancy"] } -regex = "1.8.4" +regex = "1.9.1" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.100" From 1ac5aee407013eef3f482d61c445515f4dc8eccd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:24:54 +0000 Subject: [PATCH 079/133] build(deps): bump thiserror from 1.0.40 to 1.0.43 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.40 to 1.0.43. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.40...1.0.43) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5b13e10..904ea11f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1840,18 +1840,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index f5303a9d..57e27761 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ serde_json = "1.0.100" strum = { version = "0.25", features = ["derive"] } tar = "0.4.38" tempfile = "3.6.0" -thiserror = "1.0.40" +thiserror = "1.0.43" tokio = { version = "1.29.1", features = ["full"] } tokio-retry = "0.3.0" update-informer = "1.1.0" From 3f1bb7f37bb821c7e253a9b128fdbc17282bbf85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 21:44:08 +0000 Subject: [PATCH 080/133] build(deps): bump tar from 0.4.38 to 0.4.39 Bumps [tar](https://github.com/alexcrichton/tar-rs) from 0.4.38 to 0.4.39. - [Commits](https://github.com/alexcrichton/tar-rs/compare/0.4.38...0.4.39) --- updated-dependencies: - dependency-name: tar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 904ea11f..764815c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1779,9 +1779,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" dependencies = [ "filetime", "libc", diff --git a/Cargo.toml b/Cargo.toml index 57e27761..82bb8347 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.100" strum = { version = "0.25", features = ["derive"] } -tar = "0.4.38" +tar = "0.4.39" tempfile = "3.6.0" thiserror = "1.0.43" tokio = { version = "1.29.1", features = ["full"] } From f83e91a8cee6cc9f241ccef1ecaee9d3ef2884ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 21:44:53 +0000 Subject: [PATCH 081/133] build(deps): bump miette from 5.9.0 to 5.10.0 Bumps [miette](https://github.com/zkat/miette) from 5.9.0 to 5.10.0. - [Release notes](https://github.com/zkat/miette/releases) - [Changelog](https://github.com/zkat/miette/blob/main/CHANGELOG.md) - [Commits](https://github.com/zkat/miette/compare/miette-derive-v5.9.0...miette-derive-v5.10.0) --- updated-dependencies: - dependency-name: miette dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 764815c8..b9020534 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -987,9 +987,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "miette" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a236ff270093b0b67451bc50a509bd1bad302cb1d3c7d37d5efe931238581fa9" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "backtrace", "backtrace-ext", @@ -1008,9 +1008,9 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4901771e1d44ddb37964565c654a3223ba41a594d02b8da471cc4464912b5cfa" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 82bb8347..5ef5da00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ env_logger = "0.10.0" flate2 = "1.0.26" guess_host_triple = "0.1.3" log = "0.4.19" -miette = { version = "5.9.0", features = ["fancy"] } +miette = { version = "5.10.0", features = ["fancy"] } regex = "1.9.1" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" From 45f249db35fe5f81bbd859dc60489ed6d5785a6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 21:44:38 +0000 Subject: [PATCH 082/133] build(deps): bump serde_json from 1.0.100 to 1.0.103 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.100 to 1.0.103. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.100...v1.0.103) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b9020534..dc8f31b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1615,9 +1615,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 5ef5da00..593cb41d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ miette = { version = "5.10.0", features = ["fancy"] } regex = "1.9.1" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" -serde_json = "1.0.100" +serde_json = "1.0.103" strum = { version = "0.25", features = ["derive"] } tar = "0.4.39" tempfile = "3.6.0" From 54035837ecabd154e90dd510bd34020e113d1a05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 21:44:22 +0000 Subject: [PATCH 083/133] build(deps): bump assert_cmd from 2.0.11 to 2.0.12 Bumps [assert_cmd](https://github.com/assert-rs/assert_cmd) from 2.0.11 to 2.0.12. - [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_cmd/compare/v2.0.11...v2.0.12) --- updated-dependencies: - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc8f31b1..e46d4d6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -99,9 +99,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", diff --git a/Cargo.toml b/Cargo.toml index 593cb41d..d90e2adf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ openssl = { version = "0.10.55", features = ["vendored"] } winreg = "0.50.0" [dev-dependencies] -assert_cmd = "2.0.11" +assert_cmd = "2.0.12" [package.metadata.binstall] bin-dir = "{ bin }{ binary-ext }" From 4e2d5349770a9e79ee8dd2ea95442544388c4d25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 21:43:55 +0000 Subject: [PATCH 084/133] build(deps): bump clap from 4.3.11 to 4.3.14 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.11 to 4.3.14. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.11...v4.3.14) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e46d4d6a..c2714fc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "98330784c494e49850cb23b8e2afcca13587d2500b2e3f1f78ae20248059c9be" dependencies = [ "clap_builder", "clap_derive", @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "e182eb5f2562a67dda37e2c57af64d720a9e010c5e860ed87c056586aeafa52e" dependencies = [ "anstream", "anstyle", @@ -296,9 +296,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index d90e2adf..f12f0ce6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.71" -clap = { version = "4.3.11", features = ["derive"] } +clap = { version = "4.3.14", features = ["derive"] } clap_complete = "4.3.2" console = "0.15.7" directories = "5.0.1" From 94f42dc890da297d33b61e6fbc0e21d05c5401e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:41:43 +0000 Subject: [PATCH 085/133] build(deps): bump clap from 4.3.14 to 4.3.19 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.14 to 4.3.19. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.14...v4.3.19) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2714fc8..8061e0b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.14" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98330784c494e49850cb23b8e2afcca13587d2500b2e3f1f78ae20248059c9be" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.14" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182eb5f2562a67dda37e2c57af64d720a9e010c5e860ed87c056586aeafa52e" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index f12f0ce6..ddd96009 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.71" -clap = { version = "4.3.14", features = ["derive"] } +clap = { version = "4.3.19", features = ["derive"] } clap_complete = "4.3.2" console = "0.15.7" directories = "5.0.1" From 883c6d1bf22cb7809e1564d6caeed0c10cea49a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:41:30 +0000 Subject: [PATCH 086/133] build(deps): bump thiserror from 1.0.43 to 1.0.44 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.43 to 1.0.44. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.43...1.0.44) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8061e0b3..340cd8a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1840,18 +1840,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index ddd96009..56151840 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ serde_json = "1.0.103" strum = { version = "0.25", features = ["derive"] } tar = "0.4.39" tempfile = "3.6.0" -thiserror = "1.0.43" +thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["full"] } tokio-retry = "0.3.0" update-informer = "1.1.0" From ae5ebcb9780a4c5074cec83ebb57c66248550919 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 07:01:15 +0000 Subject: [PATCH 087/133] build(deps): bump async-trait from 0.1.71 to 0.1.72 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.71 to 0.1.72. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.71...0.1.72) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 340cd8a5..2245d38e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 56151840..9f83fe7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ categories = ["command-line-utilities", "development-tools", "embedded"] rust-version = "1.65" [dependencies] -async-trait = "0.1.71" +async-trait = "0.1.72" clap = { version = "4.3.19", features = ["derive"] } clap_complete = "4.3.2" console = "0.15.7" From d4870a5ad50d56a6d06695c6c64bdb0ce8e0eba6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 07:02:01 +0000 Subject: [PATCH 088/133] build(deps): bump tempfile from 3.6.0 to 3.7.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.6.0 to 3.7.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.6.0...v3.7.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 62 ++++++++++++++++++++++++++++++++---------------------- Cargo.toml | 2 +- 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2245d38e..3554c804 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,6 +177,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block-buffer" version = "0.10.4" @@ -534,12 +540,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "filetime" @@ -857,15 +860,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "io-lifetimes" version = "1.0.10" @@ -891,7 +885,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix", + "rustix 0.37.19", "windows-sys 0.48.0", ] @@ -952,6 +946,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + [[package]] name = "lock_api" version = "0.4.9" @@ -1102,7 +1102,7 @@ version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -1340,7 +1340,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1349,7 +1349,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1476,11 +1476,24 @@ version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno 0.3.1", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.7", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno 0.3.1", + "libc", + "linux-raw-sys 0.4.3", "windows-sys 0.48.0", ] @@ -1570,7 +1583,7 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -1790,15 +1803,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.38.4", "windows-sys 0.48.0", ] diff --git a/Cargo.toml b/Cargo.toml index 9f83fe7f..1f823ea5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ retry = "2.0.0" serde_json = "1.0.103" strum = { version = "0.25", features = ["derive"] } tar = "0.4.39" -tempfile = "3.6.0" +tempfile = "3.7.0" thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["full"] } tokio-retry = "0.3.0" From c11d99a166741c1b9ce25883141017a34f1cab12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 21:50:45 +0000 Subject: [PATCH 089/133] build(deps): bump serde_json from 1.0.103 to 1.0.104 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.103 to 1.0.104. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.103...v1.0.104) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3554c804..d53dc8e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1628,9 +1628,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 1f823ea5..c7d879e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ miette = { version = "5.10.0", features = ["fancy"] } regex = "1.9.1" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" -serde_json = "1.0.103" +serde_json = "1.0.104" strum = { version = "0.25", features = ["derive"] } tar = "0.4.39" tempfile = "3.7.0" From 3897d660953215b51ace259ec636a102473da5fb Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Wed, 2 Aug 2023 15:08:11 +0200 Subject: [PATCH 090/133] Ignore shebang of install.sh files (#312) * fix: Remove -c argument * feat: Split arguments and add checking result --- src/error.rs | 11 +++++++++ src/toolchain/rust.rs | 54 ++++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/src/error.rs b/src/error.rs index a808bd89..504bd499 100644 --- a/src/error.rs +++ b/src/error.rs @@ -73,4 +73,15 @@ pub enum Error { #[diagnostic(code(espup::targets::unsupported_target))] #[error("{} Target '{0}' is not supported", emoji::ERROR)] UnsupportedTarget(String), + + #[diagnostic(code(espup::toolchain::rust::rust))] + #[error("{} Failed to install 'rust' component of Xtensa Rust", emoji::ERROR)] + XtensaRust, + + #[diagnostic(code(espup::toolchain::rust::rust_src))] + #[error( + "{} Failed to install 'rust-src' component of Xtensa Rust", + emoji::ERROR + )] + XtensaRustSrc, } diff --git a/src/toolchain/rust.rs b/src/toolchain/rust.rs index 06410366..d919d1a4 100644 --- a/src/toolchain/rust.rs +++ b/src/toolchain/rust.rs @@ -228,17 +228,28 @@ impl Installable for XtensaRust { "{} Installing 'rust' component for Xtensa Rust toolchain", emoji::WRENCH ); - let arguments = format!( - "{}/rust-nightly-{}/install.sh --destdir={} --prefix='' --without=rust-docs-json-preview,rust-docs --disable-ldconfig", - temp_rust_dir, - &self.host_triple, - self.toolchain_destination.display() - ); - Command::new("/usr/bin/env") - .args(["bash", "-c", &arguments]) + if !Command::new("/usr/bin/env") + .arg("bash") + .arg(format!( + "{}/rust-nightly-{}/install.sh", + temp_rust_dir, &self.host_triple, + )) + .arg(format!( + "--destdir={}", + self.toolchain_destination.display() + )) + .arg("--prefix=''") + .arg("--without=rust-docs-json-preview,rust-docs") + .arg("--disable-ldconfig") .stdout(Stdio::null()) - .output()?; + .output()? + .status + .success() + { + Self::uninstall(&self.toolchain_destination)?; + return Err(Error::XtensaRust); + } let temp_rust_src_dir = tempfile::TempDir::new() .unwrap() @@ -257,16 +268,23 @@ impl Installable for XtensaRust { "{} Installing 'rust-src' component for Xtensa Rust toolchain", emoji::WRENCH ); - let arguments = format!( - "{}/rust-src-nightly/install.sh --destdir={} --prefix='' --disable-ldconfig", - temp_rust_src_dir, - self.toolchain_destination.display() - ); - - Command::new("/usr/bin/env") - .args(["bash", "-c", &arguments]) + if !Command::new("/usr/bin/env") + .arg("bash") + .arg(format!("{}/rust-src-nightly/install.sh", temp_rust_src_dir)) + .arg(format!( + "--destdir={}", + self.toolchain_destination.display() + )) + .arg("--prefix=''") + .arg("--disable-ldconfig") .stdout(Stdio::null()) - .output()?; + .output()? + .status + .success() + { + Self::uninstall(&self.toolchain_destination)?; + return Err(Error::XtensaRustSrc); + } } // Some platfroms like Windows are available in single bundle rust + src, because install // script in dist is not available for the plaform. It's sufficient to extract the toolchain From a0f6179bd8f53de876b46342ba15502c97f43f59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 21:27:38 +0000 Subject: [PATCH 091/133] build(deps): bump tar from 0.4.39 to 0.4.40 Bumps [tar](https://github.com/alexcrichton/tar-rs) from 0.4.39 to 0.4.40. - [Commits](https://github.com/alexcrichton/tar-rs/compare/0.4.39...0.4.40) --- updated-dependencies: - dependency-name: tar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d53dc8e8..7e95e6c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1792,9 +1792,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -2438,9 +2438,9 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] diff --git a/Cargo.toml b/Cargo.toml index c7d879e0..cf665554 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.104" strum = { version = "0.25", features = ["derive"] } -tar = "0.4.39" +tar = "0.4.40" tempfile = "3.7.0" thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["full"] } From 90a1b7f714e20634b81ab2cd2d1e3dbdac604dec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 21:27:00 +0000 Subject: [PATCH 092/133] build(deps): bump openssl from 0.10.55 to 0.10.56 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.55 to 0.10.56. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.55...openssl-v0.10.56) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7e95e6c4..ad71245b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1098,9 +1098,9 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -1139,9 +1139,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index cf665554..75f8e19c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ xz2 = "0.1.7" zip = "0.6.6" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.55", features = ["vendored"] } +openssl = { version = "0.10.56", features = ["vendored"] } [target.'cfg(windows)'.dependencies] winreg = "0.50.0" From 7011b37622a472731ce3f32f7ac8a0eca2b1199b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 21:26:39 +0000 Subject: [PATCH 093/133] build(deps): bump regex from 1.9.1 to 1.9.3 Bumps [regex](https://github.com/rust-lang/regex) from 1.9.1 to 1.9.3. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.9.1...1.9.3) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad71245b..89536f86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1365,13 +1365,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.2", + "regex-automata 0.3.6", "regex-syntax", ] @@ -1383,9 +1383,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.3.2" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", diff --git a/Cargo.toml b/Cargo.toml index 75f8e19c..6824344e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ flate2 = "1.0.26" guess_host_triple = "0.1.3" log = "0.4.19" miette = { version = "5.10.0", features = ["fancy"] } -regex = "1.9.1" +regex = "1.9.3" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.104" From a865da6478fe773b3b064962eaa27175835e1ca0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 08:09:06 +0000 Subject: [PATCH 094/133] build(deps): bump tempfile from 3.7.0 to 3.7.1 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.7.0 to 3.7.1. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.7.0...v3.7.1) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89536f86..164cd1ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1803,9 +1803,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ "cfg-if", "fastrand", diff --git a/Cargo.toml b/Cargo.toml index 6824344e..9ee9724d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ retry = "2.0.0" serde_json = "1.0.104" strum = { version = "0.25", features = ["derive"] } tar = "0.4.40" -tempfile = "3.7.0" +tempfile = "3.7.1" thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["full"] } tokio-retry = "0.3.0" From 0a64e7813c4c5ad689ff48a34cd6dfd43e3dd919 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Fri, 11 Aug 2023 11:53:10 +0200 Subject: [PATCH 095/133] Rework update subcommand (#285) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: ✨ Refactor update and install subcomands * feat: ✨ Refactor update and install subcomands * Create issue_handler.yml * build(deps): bump serde_json from 1.0.96 to 1.0.99 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.96 to 1.0.99. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.96...v1.0.99) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump clap from 4.3.3 to 4.3.8 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.3 to 4.3.8. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.3...v4.3.8) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump openssl from 0.10.54 to 0.10.55 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.54 to 0.10.55. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.54...openssl-v0.10.55) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump strum from 0.24.1 to 0.25.0 Bumps [strum](https://github.com/Peternator7/strum) from 0.24.1 to 0.25.0. - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/commits) --- updated-dependencies: - dependency-name: strum dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update readme (#289) * docs: 📝 Update readme * docs: Udpate readme * build(deps): bump tokio from 1.28.2 to 1.29.1 (#290) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.28.2 to 1.29.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.28.2...tokio-1.29.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump async-trait from 0.1.68 to 0.1.69 (#291) Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.68 to 0.1.69. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.68...0.1.69) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump update-informer from 1.0.0 to 1.1.0 (#292) Bumps [update-informer](https://github.com/mgrachev/update-informer) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/mgrachev/update-informer/releases) - [Changelog](https://github.com/mgrachev/update-informer/blob/main/CHANGELOG.md) - [Commits](https://github.com/mgrachev/update-informer/compare/v1.0.0...v1.1.0) --- updated-dependencies: - dependency-name: update-informer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump clap from 4.3.8 to 4.3.10 (#293) Bumps [clap](https://github.com/clap-rs/clap) from 4.3.8 to 4.3.10. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.8...v4.3.10) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump clap from 4.3.10 to 4.3.11 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.10 to 4.3.11. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.10...v4.3.11) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump serde_json from 1.0.99 to 1.0.100 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.99 to 1.0.100. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.99...v1.0.100) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump async-trait from 0.1.69 to 0.1.71 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.69 to 0.1.71. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.69...0.1.71) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump clap_complete from 4.3.1 to 4.3.2 Bumps [clap_complete](https://github.com/clap-rs/clap) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.3.1...clap_complete-v4.3.2) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump regex from 1.8.4 to 1.9.1 Bumps [regex](https://github.com/rust-lang/regex) from 1.8.4 to 1.9.1. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.8.4...1.9.1) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * build(deps): bump thiserror from 1.0.40 to 1.0.43 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.40 to 1.0.43. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.40...1.0.43) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump tar from 0.4.38 to 0.4.39 Bumps [tar](https://github.com/alexcrichton/tar-rs) from 0.4.38 to 0.4.39. - [Commits](https://github.com/alexcrichton/tar-rs/compare/0.4.38...0.4.39) --- updated-dependencies: - dependency-name: tar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump miette from 5.9.0 to 5.10.0 Bumps [miette](https://github.com/zkat/miette) from 5.9.0 to 5.10.0. - [Release notes](https://github.com/zkat/miette/releases) - [Changelog](https://github.com/zkat/miette/blob/main/CHANGELOG.md) - [Commits](https://github.com/zkat/miette/compare/miette-derive-v5.9.0...miette-derive-v5.10.0) --- updated-dependencies: - dependency-name: miette dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * build(deps): bump serde_json from 1.0.100 to 1.0.103 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.100 to 1.0.103. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.100...v1.0.103) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump assert_cmd from 2.0.11 to 2.0.12 Bumps [assert_cmd](https://github.com/assert-rs/assert_cmd) from 2.0.11 to 2.0.12. - [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_cmd/compare/v2.0.11...v2.0.12) --- updated-dependencies: - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump clap from 4.3.11 to 4.3.14 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.11 to 4.3.14. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.11...v4.3.14) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump clap from 4.3.14 to 4.3.19 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.14 to 4.3.19. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.14...v4.3.19) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump thiserror from 1.0.43 to 1.0.44 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.43 to 1.0.44. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.43...1.0.44) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump async-trait from 0.1.71 to 0.1.72 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.71 to 0.1.72. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.71...0.1.72) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump tempfile from 3.6.0 to 3.7.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.6.0 to 3.7.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.6.0...v3.7.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * build(deps): bump serde_json from 1.0.103 to 1.0.104 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.103 to 1.0.104. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.103...v1.0.104) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Ignore shebang of install.sh files (#312) * fix: Remove -c argument * feat: Split arguments and add checking result * build(deps): bump tar from 0.4.39 to 0.4.40 Bumps [tar](https://github.com/alexcrichton/tar-rs) from 0.4.39 to 0.4.40. - [Commits](https://github.com/alexcrichton/tar-rs/compare/0.4.39...0.4.40) --- updated-dependencies: - dependency-name: tar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump openssl from 0.10.55 to 0.10.56 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.55 to 0.10.56. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.55...openssl-v0.10.56) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump regex from 1.9.1 to 1.9.3 Bumps [regex](https://github.com/rust-lang/regex) from 1.9.1 to 1.9.3. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.9.1...1.9.3) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump tempfile from 3.7.0 to 3.7.1 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.7.0 to 3.7.1. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.7.0...v3.7.1) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/cli.rs | 61 +++++++++++ src/lib.rs | 1 + src/main.rs | 233 ++----------------------------------------- src/toolchain/mod.rs | 134 ++++++++++++++++++++++++- 4 files changed, 205 insertions(+), 224 deletions(-) create mode 100644 src/cli.rs diff --git a/src/cli.rs b/src/cli.rs new file mode 100644 index 00000000..ed2f2483 --- /dev/null +++ b/src/cli.rs @@ -0,0 +1,61 @@ +use crate::{ + targets::{parse_targets, Target}, + toolchain::rust::XtensaRust, +}; +use clap::Parser; +use clap_complete::Shell; +use std::{collections::HashSet, path::PathBuf}; + +#[derive(Debug, Parser)] +pub struct CompletionsOpts { + /// Verbosity level of the logs. + #[arg(short = 'l', long, default_value = "info", value_parser = ["debug", "info", "warn", "error"])] + pub log_level: String, + /// Shell to generate completions for. + pub shell: Shell, +} + +#[derive(Debug, Parser)] +pub struct InstallOpts { + /// Target triple of the host. + #[arg(short = 'd', long, value_parser = ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "x86_64-pc-windows-msvc", "x86_64-pc-windows-gnu" , "x86_64-apple-darwin" , "aarch64-apple-darwin"])] + pub default_host: Option, + /// Relative or full path for the export file that will be generated. If no path is provided, the file will be generated under home directory (https://docs.rs/dirs/latest/dirs/fn.home_dir.html). + #[arg(short = 'f', long)] + pub export_file: Option, + /// Extends the LLVM installation. + /// + /// This will install the whole LLVM instead of only installing the libs. + #[arg(short = 'e', long)] + pub extended_llvm: bool, + /// Verbosity level of the logs. + #[arg(short = 'l', long, default_value = "info", value_parser = ["debug", "info", "warn", "error"])] + pub log_level: String, + /// Xtensa Rust toolchain name. + #[arg(short = 'a', long, default_value = "esp")] + pub name: String, + /// Nightly Rust toolchain version. + #[arg(short = 'n', long, default_value = "nightly")] + pub nightly_version: String, + /// Only install toolchains required for STD applications. + /// + /// With this option, espup will skip GCC installation (it will be handled by esp-idf-sys), hence you won't be able to build no_std applications. + #[arg(short = 's', long)] + pub std: bool, + /// Comma or space separated list of targets [esp32,esp32c2,esp32c3,esp32c6,esp32h2,esp32s2,esp32s3,all]. + #[arg(short = 't', long, default_value = "all", value_parser = parse_targets)] + pub targets: HashSet, + /// Xtensa Rust toolchain version. + #[arg(short = 'v', long, value_parser = XtensaRust::parse_version)] + pub toolchain_version: Option, +} + +#[derive(Debug, Parser)] +pub struct UninstallOpts { + /// Verbosity level of the logs. + #[arg(short = 'l', long, default_value = "info", value_parser = ["debug", "info", "warn", "error"])] + pub log_level: String, + /// Xtensa Rust toolchain name. + #[arg(short = 'a', long, default_value = "esp")] + pub name: String, +} diff --git a/src/lib.rs b/src/lib.rs index e4312115..4f6db2eb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,4 @@ +pub mod cli; pub mod emoji; pub mod env; pub mod error; diff --git a/src/main.rs b/src/main.rs index cd8f9f8e..90ca41a2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,27 +1,20 @@ use clap::{CommandFactory, Parser}; -use clap_complete::Shell; #[cfg(windows)] use espup::env::set_environment_variable; use espup::{ + cli::{CompletionsOpts, InstallOpts, UninstallOpts}, emoji, - env::{create_export_file, export_environment, get_export_file}, error::Error, - host_triple::get_host_triple, logging::initialize_logger, - targets::{parse_targets, Target}, toolchain::{ - gcc::{uninstall_gcc_toolchains, Gcc}, - llvm::Llvm, - rust::{check_rust_installation, get_rustup_home, RiscVTarget, XtensaRust}, - Installable, + gcc::uninstall_gcc_toolchains, install as toolchain_install, llvm::Llvm, + rust::get_rustup_home, }, update::check_for_update, }; -use log::{debug, info, warn}; +use log::info; use miette::Result; -use std::{collections::HashSet, env, fs::remove_dir_all, path::PathBuf}; -use tokio::sync::mpsc; -use tokio_retry::{strategy::FixedInterval, Retry}; +use std::{env, fs::remove_dir_all}; #[derive(Parser)] #[command(about, version)] @@ -40,77 +33,7 @@ pub enum SubCommand { /// Uninstalls Espressif Rust ecosystem. Uninstall(UninstallOpts), /// Updates Xtensa Rust toolchain. - Update(UpdateOpts), -} - -#[derive(Debug, Parser)] -pub struct CompletionsOpts { - /// Verbosity level of the logs. - #[arg(short = 'l', long, default_value = "info", value_parser = ["debug", "info", "warn", "error"])] - pub log_level: String, - /// Shell to generate completions for. - pub shell: Shell, -} - -#[derive(Debug, Parser)] -pub struct InstallOpts { - /// Target triple of the host. - #[arg(short = 'd', long, value_parser = ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "x86_64-pc-windows-msvc", "x86_64-pc-windows-gnu" , "x86_64-apple-darwin" , "aarch64-apple-darwin"])] - pub default_host: Option, - /// Relative or full path for the export file that will be generated. If no path is provided, the file will be generated under home directory (https://docs.rs/dirs/latest/dirs/fn.home_dir.html). - #[arg(short = 'f', long)] - pub export_file: Option, - /// Extends the LLVM installation. - /// - /// This will install the whole LLVM instead of only installing the libs. - #[arg(short = 'e', long)] - pub extended_llvm: bool, - /// Verbosity level of the logs. - #[arg(short = 'l', long, default_value = "info", value_parser = ["debug", "info", "warn", "error"])] - pub log_level: String, - /// Xtensa Rust toolchain name. - #[arg(short = 'a', long, default_value = "esp")] - pub name: String, - /// Nightly Rust toolchain version. - #[arg(short = 'n', long, default_value = "nightly")] - pub nightly_version: String, - /// Only install toolchains required for STD applications. - /// - /// With this option, espup will skip GCC installation (it will be handled by esp-idf-sys), hence you won't be able to build no_std applications. - #[arg(short = 's', long)] - pub std: bool, - /// Comma or space separated list of targets [esp32,esp32c2,esp32c3,esp32c6,esp32h2,esp32s2,esp32s3,all]. - #[arg(short = 't', long, default_value = "all", value_parser = parse_targets)] - pub targets: HashSet, - /// Xtensa Rust toolchain version. - #[arg(short = 'v', long, value_parser = XtensaRust::parse_version)] - pub toolchain_version: Option, -} - -#[derive(Debug, Parser)] -pub struct UpdateOpts { - /// Target triple of the host. - #[arg(short = 'd', long, value_parser = ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "x86_64-pc-windows-msvc", "x86_64-pc-windows-gnu" , "x86_64-apple-darwin" , "aarch64-apple-darwin"])] - pub default_host: Option, - /// Verbosity level of the logs. - #[arg(short = 'l', long, default_value = "info", value_parser = ["debug", "info", "warn", "error"])] - pub log_level: String, - /// Xtensa Rust toolchain name. - #[arg(short = 'a', long, default_value = "esp")] - pub name: String, - /// Xtensa Rust toolchain version. - #[arg(short = 'v', long, value_parser = XtensaRust::parse_version)] - pub toolchain_version: Option, -} - -#[derive(Debug, Parser)] -pub struct UninstallOpts { - /// Verbosity level of the logs. - #[arg(short = 'l', long, default_value = "info", value_parser = ["debug", "info", "warn", "error"])] - pub log_level: String, - /// Xtensa Rust toolchain name. - #[arg(short = 'a', long, default_value = "esp")] - pub name: String, + Update(Box), } /// Updates Xtensa Rust toolchain. @@ -142,122 +65,8 @@ async fn install(args: InstallOpts) -> Result<()> { check_for_update(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")); info!("{} Installing the Espressif Rust ecosystem", emoji::DISC); - - let export_file = get_export_file(args.export_file)?; - let mut exports: Vec = Vec::new(); - let host_triple = get_host_triple(args.default_host)?; - let xtensa_rust_version = if let Some(toolchain_version) = &args.toolchain_version { - toolchain_version.clone() - } else { - XtensaRust::get_latest_version().await? - }; - let install_path = get_rustup_home().join("toolchains").join(args.name); - let llvm: Llvm = Llvm::new( - &install_path, - &host_triple, - args.extended_llvm, - &xtensa_rust_version, - )?; - let targets = args.targets; - let xtensa_rust = if targets.contains(&Target::ESP32) - || targets.contains(&Target::ESP32S2) - || targets.contains(&Target::ESP32S3) - { - Some(XtensaRust::new( - &xtensa_rust_version, - &host_triple, - &install_path, - )) - } else { - None - }; - - debug!( - "{} Arguments: - - Export file: {:?} - - Host triple: {} - - LLVM Toolchain: {:?} - - Nightly version: {:?} - - Rust Toolchain: {:?} - - Targets: {:?} - - Toolchain path: {:?} - - Toolchain version: {:?}", - emoji::INFO, - &export_file, - host_triple, - &llvm, - &args.nightly_version, - xtensa_rust, - targets, - &install_path, - args.toolchain_version, - ); - - check_rust_installation().await?; - - // Build up a vector of installable applications, all of which implement the - // `Installable` async trait. - let mut to_install = Vec::>::new(); - - if let Some(ref xtensa_rust) = xtensa_rust { - to_install.push(Box::new(xtensa_rust.to_owned())); - } - - to_install.push(Box::new(llvm)); - - if targets.iter().any(|t| t.is_riscv()) { - let riscv_target = RiscVTarget::new(&args.nightly_version); - to_install.push(Box::new(riscv_target)); - } - - if !args.std { - targets.iter().for_each(|target| { - if target.is_xtensa() { - let gcc = Gcc::new(target, &host_triple, &install_path); - to_install.push(Box::new(gcc)); - } - }); - // All RISC-V targets use the same GCC toolchain - // ESP32S2 and ESP32S3 also install the RISC-V toolchain for their ULP coprocessor - if targets.iter().any(|t| t != &Target::ESP32) { - let riscv_gcc = Gcc::new_riscv(&host_triple, &install_path); - to_install.push(Box::new(riscv_gcc)); - } - } - - // With a list of applications to install, install them all in parallel. - let installable_items = to_install.len(); - let (tx, mut rx) = mpsc::channel::, Error>>(installable_items); - for app in to_install { - let tx = tx.clone(); - let retry_strategy = FixedInterval::from_millis(50).take(3); - tokio::spawn(async move { - let res = Retry::spawn(retry_strategy, || async { - let res = app.install().await; - if res.is_err() { - warn!( - "{} Installation for '{}' failed, retrying", - emoji::WARN, - app.name() - ); - } - res - }) - .await; - tx.send(res).await.unwrap(); - }); - } - - // Read the results of the install tasks as they complete. - for _ in 0..installable_items { - let names = rx.recv().await.unwrap()?; - exports.extend(names); - } - - create_export_file(&export_file, &exports)?; - + toolchain_install(args).await?; info!("{} Installation successfully completed!", emoji::CHECK); - export_environment(&export_file)?; Ok(()) } @@ -290,34 +99,12 @@ async fn uninstall(args: UninstallOpts) -> Result<()> { } /// Updates Xtensa Rust toolchain. -async fn update(args: UpdateOpts) -> Result<()> { +async fn update(args: InstallOpts) -> Result<()> { initialize_logger(&args.log_level); check_for_update(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")); info!("{} Updating Espressif Rust ecosystem", emoji::DISC); - - let host_triple = get_host_triple(args.default_host)?; - let install_path = get_rustup_home().join("toolchains").join(args.name); - let xtensa_rust: XtensaRust = if let Some(toolchain_version) = args.toolchain_version { - XtensaRust::new(&toolchain_version, &host_triple, &install_path) - } else { - let latest_version = XtensaRust::get_latest_version().await?; - XtensaRust::new(&latest_version, &host_triple, &install_path) - }; - - debug!( - "{} Arguments: - - Host triple: {} - - Install path: {:#?} - - Toolchain version: {:#?}", - emoji::INFO, - host_triple, - install_path, - xtensa_rust, - ); - - xtensa_rust.install().await?; - + toolchain_install(args).await?; info!("{} Update successfully completed!", emoji::CHECK); Ok(()) } @@ -327,7 +114,7 @@ async fn main() -> Result<()> { match Cli::parse().subcommand { SubCommand::Completions(args) => completions(args).await, SubCommand::Install(args) => install(*args).await, - SubCommand::Update(args) => update(args).await, + SubCommand::Update(args) => update(*args).await, SubCommand::Uninstall(args) => uninstall(args).await, } } diff --git a/src/toolchain/mod.rs b/src/toolchain/mod.rs index 30c20ac8..706c72b7 100644 --- a/src/toolchain/mod.rs +++ b/src/toolchain/mod.rs @@ -1,6 +1,18 @@ //! Different toolchains source and installation tools. -use crate::{emoji, error::Error}; +use crate::{ + cli::InstallOpts, + emoji, + env::{create_export_file, export_environment, get_export_file}, + error::Error, + host_triple::get_host_triple, + targets::Target, + toolchain::{ + gcc::Gcc, + llvm::Llvm, + rust::{check_rust_installation, get_rustup_home, RiscVTarget, XtensaRust}, + }, +}; use async_trait::async_trait; use flate2::bufread::GzDecoder; use log::{debug, info, warn}; @@ -14,6 +26,8 @@ use std::{ path::{Path, PathBuf}, }; use tar::Archive; +use tokio::sync::mpsc; +use tokio_retry::{strategy::FixedInterval, Retry}; use xz2::read::XzDecoder; use zip::ZipArchive; @@ -128,6 +142,124 @@ pub async fn download_file( Ok(format!("{output_directory}/{file_name}")) } +/// Installs or updates the Espressif Rust ecosystem. +pub async fn install(args: InstallOpts) -> Result<()> { + let export_file = get_export_file(args.export_file)?; + let mut exports: Vec = Vec::new(); + let host_triple = get_host_triple(args.default_host)?; + let xtensa_rust_version = if let Some(toolchain_version) = &args.toolchain_version { + toolchain_version.clone() + } else { + XtensaRust::get_latest_version().await? + }; + let install_path = get_rustup_home().join("toolchains").join(args.name); + let llvm: Llvm = Llvm::new( + &install_path, + &host_triple, + args.extended_llvm, + &xtensa_rust_version, + )?; + let targets = args.targets; + let xtensa_rust = if targets.contains(&Target::ESP32) + || targets.contains(&Target::ESP32S2) + || targets.contains(&Target::ESP32S3) + { + Some(XtensaRust::new( + &xtensa_rust_version, + &host_triple, + &install_path, + )) + } else { + None + }; + + debug!( + "{} Arguments: + - Export file: {:?} + - Host triple: {} + - LLVM Toolchain: {:?} + - Nightly version: {:?} + - Rust Toolchain: {:?} + - Targets: {:?} + - Toolchain path: {:?} + - Toolchain version: {:?}", + emoji::INFO, + &export_file, + host_triple, + &llvm, + &args.nightly_version, + xtensa_rust, + targets, + &install_path, + args.toolchain_version, + ); + + check_rust_installation().await?; + + // Build up a vector of installable applications, all of which implement the + // `Installable` async trait. + let mut to_install = Vec::>::new(); + + if let Some(ref xtensa_rust) = xtensa_rust { + to_install.push(Box::new(xtensa_rust.to_owned())); + } + + to_install.push(Box::new(llvm)); + + if targets.iter().any(|t| t.is_riscv()) { + let riscv_target = RiscVTarget::new(&args.nightly_version); + to_install.push(Box::new(riscv_target)); + } + + if !args.std { + targets.iter().for_each(|target| { + if target.is_xtensa() { + let gcc = Gcc::new(target, &host_triple, &install_path); + to_install.push(Box::new(gcc)); + } + }); + // All RISC-V targets use the same GCC toolchain + // ESP32S2 and ESP32S3 also install the RISC-V toolchain for their ULP coprocessor + if targets.iter().any(|t| t != &Target::ESP32) { + let riscv_gcc = Gcc::new_riscv(&host_triple, &install_path); + to_install.push(Box::new(riscv_gcc)); + } + } + + // With a list of applications to install, install them all in parallel. + let installable_items = to_install.len(); + let (tx, mut rx) = mpsc::channel::, Error>>(installable_items); + for app in to_install { + let tx = tx.clone(); + let retry_strategy = FixedInterval::from_millis(50).take(3); + tokio::spawn(async move { + let res = Retry::spawn(retry_strategy, || async { + let res = app.install().await; + if res.is_err() { + warn!( + "{} Installation for '{}' failed, retrying", + emoji::WARN, + app.name() + ); + } + res + }) + .await; + tx.send(res).await.unwrap(); + }); + } + + // Read the results of the install tasks as they complete. + for _ in 0..installable_items { + let names = rx.recv().await.unwrap()?; + exports.extend(names); + } + + create_export_file(&export_file, &exports)?; + export_environment(&export_file)?; + Ok(()) +} + /// Queries the GitHub API and returns the JSON response. pub fn github_query(url: &str) -> Result { info!("{} Querying GitHub API: '{}'", emoji::INFO, url); From 3d4bba33c7ac78d7b82e7fbc2593766ad212c312 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Fri, 11 Aug 2023 12:12:41 +0200 Subject: [PATCH 096/133] Prepare for next release (#318) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build: Bump crates version * Rework update subcommand (#285) * feat: ✨ Refactor update and install subcomands * feat: ✨ Refactor update and install subcomands * Create issue_handler.yml * build(deps): bump serde_json from 1.0.96 to 1.0.99 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.96 to 1.0.99. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.96...v1.0.99) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump clap from 4.3.3 to 4.3.8 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.3 to 4.3.8. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.3...v4.3.8) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump openssl from 0.10.54 to 0.10.55 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.54 to 0.10.55. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.54...openssl-v0.10.55) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump strum from 0.24.1 to 0.25.0 Bumps [strum](https://github.com/Peternator7/strum) from 0.24.1 to 0.25.0. - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/commits) --- updated-dependencies: - dependency-name: strum dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update readme (#289) * docs: 📝 Update readme * docs: Udpate readme * build(deps): bump tokio from 1.28.2 to 1.29.1 (#290) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.28.2 to 1.29.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.28.2...tokio-1.29.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump async-trait from 0.1.68 to 0.1.69 (#291) Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.68 to 0.1.69. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.68...0.1.69) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump update-informer from 1.0.0 to 1.1.0 (#292) Bumps [update-informer](https://github.com/mgrachev/update-informer) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/mgrachev/update-informer/releases) - [Changelog](https://github.com/mgrachev/update-informer/blob/main/CHANGELOG.md) - [Commits](https://github.com/mgrachev/update-informer/compare/v1.0.0...v1.1.0) --- updated-dependencies: - dependency-name: update-informer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump clap from 4.3.8 to 4.3.10 (#293) Bumps [clap](https://github.com/clap-rs/clap) from 4.3.8 to 4.3.10. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.8...v4.3.10) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump clap from 4.3.10 to 4.3.11 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.10 to 4.3.11. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.10...v4.3.11) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump serde_json from 1.0.99 to 1.0.100 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.99 to 1.0.100. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.99...v1.0.100) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump async-trait from 0.1.69 to 0.1.71 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.69 to 0.1.71. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.69...0.1.71) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump clap_complete from 4.3.1 to 4.3.2 Bumps [clap_complete](https://github.com/clap-rs/clap) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.3.1...clap_complete-v4.3.2) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump regex from 1.8.4 to 1.9.1 Bumps [regex](https://github.com/rust-lang/regex) from 1.8.4 to 1.9.1. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.8.4...1.9.1) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * build(deps): bump thiserror from 1.0.40 to 1.0.43 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.40 to 1.0.43. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.40...1.0.43) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump tar from 0.4.38 to 0.4.39 Bumps [tar](https://github.com/alexcrichton/tar-rs) from 0.4.38 to 0.4.39. - [Commits](https://github.com/alexcrichton/tar-rs/compare/0.4.38...0.4.39) --- updated-dependencies: - dependency-name: tar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump miette from 5.9.0 to 5.10.0 Bumps [miette](https://github.com/zkat/miette) from 5.9.0 to 5.10.0. - [Release notes](https://github.com/zkat/miette/releases) - [Changelog](https://github.com/zkat/miette/blob/main/CHANGELOG.md) - [Commits](https://github.com/zkat/miette/compare/miette-derive-v5.9.0...miette-derive-v5.10.0) --- updated-dependencies: - dependency-name: miette dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * build(deps): bump serde_json from 1.0.100 to 1.0.103 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.100 to 1.0.103. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.100...v1.0.103) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump assert_cmd from 2.0.11 to 2.0.12 Bumps [assert_cmd](https://github.com/assert-rs/assert_cmd) from 2.0.11 to 2.0.12. - [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_cmd/compare/v2.0.11...v2.0.12) --- updated-dependencies: - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump clap from 4.3.11 to 4.3.14 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.11 to 4.3.14. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.11...v4.3.14) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump clap from 4.3.14 to 4.3.19 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.14 to 4.3.19. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.14...v4.3.19) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump thiserror from 1.0.43 to 1.0.44 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.43 to 1.0.44. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.43...1.0.44) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump async-trait from 0.1.71 to 0.1.72 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.71 to 0.1.72. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.71...0.1.72) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump tempfile from 3.6.0 to 3.7.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.6.0 to 3.7.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.6.0...v3.7.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * build(deps): bump serde_json from 1.0.103 to 1.0.104 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.103 to 1.0.104. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.103...v1.0.104) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Ignore shebang of install.sh files (#312) * fix: Remove -c argument * feat: Split arguments and add checking result * build(deps): bump tar from 0.4.39 to 0.4.40 Bumps [tar](https://github.com/alexcrichton/tar-rs) from 0.4.39 to 0.4.40. - [Commits](https://github.com/alexcrichton/tar-rs/compare/0.4.39...0.4.40) --- updated-dependencies: - dependency-name: tar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump openssl from 0.10.55 to 0.10.56 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.55 to 0.10.56. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.55...openssl-v0.10.56) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump regex from 1.9.1 to 1.9.3 Bumps [regex](https://github.com/rust-lang/regex) from 1.9.1 to 1.9.3. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.9.1...1.9.3) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): bump tempfile from 3.7.0 to 3.7.1 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.7.0 to 3.7.1. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.7.0...v3.7.1) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 33 +++++++++++++++++++++------------ Cargo.toml | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 164cd1ea..d420f4fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -270,9 +270,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" dependencies = [ "clap_builder", "clap_derive", @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" dependencies = [ "anstream", "anstyle", @@ -508,7 +508,7 @@ dependencies = [ [[package]] name = "espup" -version = "0.4.1" +version = "0.5.0" dependencies = [ "assert_cmd", "async-trait", @@ -798,7 +798,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1236,9 +1236,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -1711,6 +1711,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "spin" version = "0.5.2" @@ -1903,11 +1913,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -1916,7 +1925,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] diff --git a/Cargo.toml b/Cargo.toml index 9ee9724d..6c9fb314 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espup" -version = "0.4.1" +version = "0.5.0" authors = ["Sergio Gasquez Arcos "] edition = "2021" license = "MIT OR Apache-2.0" @@ -14,29 +14,29 @@ categories = ["command-line-utilities", "development-tools", "embedded"] rust-version = "1.65" [dependencies] -async-trait = "0.1.72" -clap = { version = "4.3.19", features = ["derive"] } -clap_complete = "4.3.2" -console = "0.15.7" -directories = "5.0.1" -env_logger = "0.10.0" -flate2 = "1.0.26" +async-trait = "0.1.72" +clap = { version = "4.3.21", features = ["derive"] } +clap_complete = "4.3.2" +console = "0.15.7" +directories = "5.0.1" +env_logger = "0.10.0" +flate2 = "1.0.26" guess_host_triple = "0.1.3" -log = "0.4.19" -miette = { version = "5.10.0", features = ["fancy"] } -regex = "1.9.3" -reqwest = { version = "0.11.18", features = ["blocking"] } -retry = "2.0.0" -serde_json = "1.0.104" -strum = { version = "0.25", features = ["derive"] } -tar = "0.4.40" -tempfile = "3.7.1" -thiserror = "1.0.44" -tokio = { version = "1.29.1", features = ["full"] } -tokio-retry = "0.3.0" -update-informer = "1.1.0" -xz2 = "0.1.7" -zip = "0.6.6" +log = "0.4.19" +miette = { version = "5.10.0", features = ["fancy"] } +regex = "1.9.3" +reqwest = { version = "0.11.18", features = ["blocking"] } +retry = "2.0.0" +serde_json = "1.0.104" +strum = { version = "0.25", features = ["derive"] } +tar = "0.4.40" +tempfile = "3.7.1" +thiserror = "1.0.44" +tokio = { version = "1.30.0", features = ["full"] } +tokio-retry = "0.3.0" +update-informer = "1.1.0" +xz2 = "0.1.7" +zip = "0.6.6" [target.'cfg(unix)'.dependencies] openssl = { version = "0.10.56", features = ["vendored"] } @@ -53,5 +53,5 @@ pkg-fmt = "zip" pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ target }.{ archive-format }" [profile.release] -lto = "thin" +lto = "thin" strip = true From 2cd11fd1b14ec63830bc82015fc6fec24e719e10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:08:26 +0200 Subject: [PATCH 097/133] build(deps): bump log from 0.4.19 to 0.4.20 (#321) Bumps [log](https://github.com/rust-lang/log) from 0.4.19 to 0.4.20. - [Release notes](https://github.com/rust-lang/log/releases) - [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/log/compare/0.4.19...0.4.20) --- updated-dependencies: - dependency-name: log dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d420f4fe..05432f84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -964,9 +964,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lzma-sys" diff --git a/Cargo.toml b/Cargo.toml index 6c9fb314..f05dd222 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ directories = "5.0.1" env_logger = "0.10.0" flate2 = "1.0.26" guess_host_triple = "0.1.3" -log = "0.4.19" +log = "0.4.20" miette = { version = "5.10.0", features = ["fancy"] } regex = "1.9.3" reqwest = { version = "0.11.18", features = ["blocking"] } From 5b2ea19701345efac3f9b1d9b245ee2216ef2ec8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:08:35 +0200 Subject: [PATCH 098/133] build(deps): bump tokio from 1.30.0 to 1.31.0 (#320) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.30.0 to 1.31.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.30.0...tokio-1.31.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05432f84..9ce1a3aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1913,9 +1913,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.30.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" +checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" dependencies = [ "backtrace", "bytes", diff --git a/Cargo.toml b/Cargo.toml index f05dd222..0973e4cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ strum = { version = "0.25", features = ["derive"] } tar = "0.4.40" tempfile = "3.7.1" thiserror = "1.0.44" -tokio = { version = "1.30.0", features = ["full"] } +tokio = { version = "1.31.0", features = ["full"] } tokio-retry = "0.3.0" update-informer = "1.1.0" xz2 = "0.1.7" From 4dd657cc2a917dafcf58b800465210e30c07dd22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:08:41 +0200 Subject: [PATCH 099/133] build(deps): bump async-trait from 0.1.72 to 0.1.73 (#319) Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.72 to 0.1.73. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.72...0.1.73) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ce1a3aa..399e41c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 0973e4cf..dd46746b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ categories = ["command-line-utilities", "development-tools", "embedded"] rust-version = "1.65" [dependencies] -async-trait = "0.1.72" +async-trait = "0.1.73" clap = { version = "4.3.21", features = ["derive"] } clap_complete = "4.3.2" console = "0.15.7" From 2e8bd1af442d9498e10c7cc60bb8e5ea4d2baf85 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 31 Aug 2023 13:05:03 +0200 Subject: [PATCH 100/133] fix: Fix clippy lint --- src/env.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/env.rs b/src/env.rs index f2177ad1..9d381b50 100644 --- a/src/env.rs +++ b/src/env.rs @@ -73,7 +73,7 @@ pub fn create_export_file(export_file: &PathBuf, exports: &[String]) -> Result<( let mut file = File::create(export_file)?; for e in exports.iter() { #[cfg(windows)] - let e = e.replace('/', r#"\"#); + let e = e.replace('/', r"\"); file.write_all(e.as_bytes())?; file.write_all(b"\n")?; } From e63be20ffb725652c1dfe0d7cda2cdc7c2fa2846 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 12:43:19 +0000 Subject: [PATCH 101/133] build(deps): bump openssl from 0.10.56 to 0.10.57 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.56 to 0.10.57. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.56...openssl-v0.10.57) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 399e41c0..d3f92ef1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1098,11 +1098,11 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.56" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "cfg-if", "foreign-types", "libc", @@ -1139,9 +1139,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index dd46746b..d2ede12d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ xz2 = "0.1.7" zip = "0.6.6" [target.'cfg(unix)'.dependencies] -openssl = { version = "0.10.56", features = ["vendored"] } +openssl = { version = "0.10.57", features = ["vendored"] } [target.'cfg(windows)'.dependencies] winreg = "0.50.0" From 1a96e110eb277596a1e84cc0c134b5ea46bf509f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 21:09:15 +0000 Subject: [PATCH 102/133] build(deps): bump tempfile from 3.7.1 to 3.8.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.7.1 to 3.8.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.7.1...v3.8.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d3f92ef1..cc7d02c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1813,9 +1813,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", diff --git a/Cargo.toml b/Cargo.toml index d2ede12d..6ec34586 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ retry = "2.0.0" serde_json = "1.0.104" strum = { version = "0.25", features = ["derive"] } tar = "0.4.40" -tempfile = "3.7.1" +tempfile = "3.8.0" thiserror = "1.0.44" tokio = { version = "1.31.0", features = ["full"] } tokio-retry = "0.3.0" From ab388ebe9755ddcc4d91cbf9a4c5d8fd3faec76f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 21:08:27 +0000 Subject: [PATCH 103/133] build(deps): bump tokio from 1.31.0 to 1.32.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.31.0 to 1.32.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.31.0...tokio-1.32.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc7d02c3..c0a39151 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1913,9 +1913,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ "backtrace", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 6ec34586..8e2d4dc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ strum = { version = "0.25", features = ["derive"] } tar = "0.4.40" tempfile = "3.8.0" thiserror = "1.0.44" -tokio = { version = "1.31.0", features = ["full"] } +tokio = { version = "1.32.0", features = ["full"] } tokio-retry = "0.3.0" update-informer = "1.1.0" xz2 = "0.1.7" From 22c3f25aaa68c21168a9801c41b1447697d5965c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 21:08:42 +0000 Subject: [PATCH 104/133] build(deps): bump serde_json from 1.0.104 to 1.0.105 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.104 to 1.0.105. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.104...v1.0.105) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c0a39151..c60a6c00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1628,9 +1628,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 8e2d4dc6..a8a83a11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ miette = { version = "5.10.0", features = ["fancy"] } regex = "1.9.3" reqwest = { version = "0.11.18", features = ["blocking"] } retry = "2.0.0" -serde_json = "1.0.104" +serde_json = "1.0.105" strum = { version = "0.25", features = ["derive"] } tar = "0.4.40" tempfile = "3.8.0" From 56f83f3102d53b2aa7cb9d1cc63bc56cced4d2a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 21:08:49 +0000 Subject: [PATCH 105/133] build(deps): bump flate2 from 1.0.26 to 1.0.27 Bumps [flate2](https://github.com/rust-lang/flate2-rs) from 1.0.26 to 1.0.27. - [Release notes](https://github.com/rust-lang/flate2-rs/releases) - [Commits](https://github.com/rust-lang/flate2-rs/compare/1.0.26...1.0.27) --- updated-dependencies: - dependency-name: flate2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c60a6c00..b12a53b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -558,9 +558,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide 0.7.1", diff --git a/Cargo.toml b/Cargo.toml index a8a83a11..8d63ebca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ clap_complete = "4.3.2" console = "0.15.7" directories = "5.0.1" env_logger = "0.10.0" -flate2 = "1.0.26" +flate2 = "1.0.27" guess_host_triple = "0.1.3" log = "0.4.20" miette = { version = "5.10.0", features = ["fancy"] } From 8970e90eafb3461bd113487349e6f45dc0ac0b7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 13:56:41 +0000 Subject: [PATCH 106/133] build(deps): bump reqwest from 0.11.18 to 0.11.20 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.18 to 0.11.20. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.18...v0.11.20) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 41 +++++++++++++++++++---------------------- Cargo.toml | 2 +- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b12a53b8..4b2f989b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -533,7 +533,7 @@ dependencies = [ "tokio", "tokio-retry", "update-informer", - "winreg 0.50.0", + "winreg", "xz2", "zip", ] @@ -813,7 +813,7 @@ checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper", - "rustls 0.21.2", + "rustls 0.21.7", "tokio", "tokio-rustls", ] @@ -1400,9 +1400,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "base64 0.21.0", "bytes", @@ -1423,7 +1423,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.2", + "rustls 0.21.7", "rustls-pemfile", "serde", "serde_json", @@ -1436,8 +1436,8 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", - "winreg 0.10.1", + "webpki-roots 0.25.2", + "winreg", ] [[package]] @@ -1511,9 +1511,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.2" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -1532,9 +1532,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -1968,7 +1968,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.2", + "rustls 0.21.7", "tokio", ] @@ -2096,7 +2096,7 @@ dependencies = [ "serde_json", "url", "webpki", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -2248,6 +2248,12 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "winapi" version = "0.3.9" @@ -2426,15 +2432,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - [[package]] name = "winreg" version = "0.50.0" diff --git a/Cargo.toml b/Cargo.toml index 8d63ebca..90283555 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ guess_host_triple = "0.1.3" log = "0.4.20" miette = { version = "5.10.0", features = ["fancy"] } regex = "1.9.3" -reqwest = { version = "0.11.18", features = ["blocking"] } +reqwest = { version = "0.11.20", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.105" strum = { version = "0.25", features = ["derive"] } From 401986ebf9c41360944d80eeb942524bfa8fbf74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 13:56:54 +0000 Subject: [PATCH 107/133] build(deps): bump thiserror from 1.0.44 to 1.0.47 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.44 to 1.0.47. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.44...1.0.47) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4b2f989b..d6512f66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1862,18 +1862,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 90283555..11a0a85b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ serde_json = "1.0.105" strum = { version = "0.25", features = ["derive"] } tar = "0.4.40" tempfile = "3.8.0" -thiserror = "1.0.44" +thiserror = "1.0.47" tokio = { version = "1.32.0", features = ["full"] } tokio-retry = "0.3.0" update-informer = "1.1.0" From 1c94c94aae1f090d9983e67fd53e4c1fbb37027c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 15:42:36 +0000 Subject: [PATCH 108/133] build(deps): bump winreg from 0.50.0 to 0.51.0 Bumps [winreg](https://github.com/gentoo90/winreg-rs) from 0.50.0 to 0.51.0. - [Release notes](https://github.com/gentoo90/winreg-rs/releases) - [Changelog](https://github.com/gentoo90/winreg-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/gentoo90/winreg-rs/compare/v0.50.0...v0.51.0) --- updated-dependencies: - dependency-name: winreg dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 14 ++++++++++++-- Cargo.toml | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6512f66..eaa9b3ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -533,7 +533,7 @@ dependencies = [ "tokio", "tokio-retry", "update-informer", - "winreg", + "winreg 0.51.0", "xz2", "zip", ] @@ -1437,7 +1437,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots 0.25.2", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -2442,6 +2442,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "xattr" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index 11a0a85b..420590dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ zip = "0.6.6" openssl = { version = "0.10.57", features = ["vendored"] } [target.'cfg(windows)'.dependencies] -winreg = "0.50.0" +winreg = "0.51.0" [dev-dependencies] assert_cmd = "2.0.12" From e0f6513264e0cc3d52dffe8f067c1dc8d102f98d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 22:01:09 +0000 Subject: [PATCH 109/133] build(deps): bump regex from 1.9.3 to 1.9.5 Bumps [regex](https://github.com/rust-lang/regex) from 1.9.3 to 1.9.5. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.9.3...1.9.5) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eaa9b3ee..23b4a7ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -981,9 +981,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "miette" @@ -1365,13 +1365,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", + "regex-automata 0.3.8", "regex-syntax", ] @@ -1383,9 +1383,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -1394,9 +1394,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" diff --git a/Cargo.toml b/Cargo.toml index 420590dd..2a3ba325 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ flate2 = "1.0.27" guess_host_triple = "0.1.3" log = "0.4.20" miette = { version = "5.10.0", features = ["fancy"] } -regex = "1.9.3" +regex = "1.9.5" reqwest = { version = "0.11.20", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.105" From 6fcdd89c0b4ffa0fac12ff7e2f23fabcd953cca3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 22:00:51 +0000 Subject: [PATCH 110/133] build(deps): bump thiserror from 1.0.47 to 1.0.48 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.47 to 1.0.48. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.47...1.0.48) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 23b4a7ab..04307b8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1862,18 +1862,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 2a3ba325..552cc0c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ serde_json = "1.0.105" strum = { version = "0.25", features = ["derive"] } tar = "0.4.40" tempfile = "3.8.0" -thiserror = "1.0.47" +thiserror = "1.0.48" tokio = { version = "1.32.0", features = ["full"] } tokio-retry = "0.3.0" update-informer = "1.1.0" From 8da82ecc2bf4daea7b264174437605ef51e7a19d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 21:43:43 +0000 Subject: [PATCH 111/133] build(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/audit.yaml | 2 +- .github/workflows/cd.yaml | 4 ++-- .github/workflows/ci.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml index 62f3a02c..e97ab8b4 100644 --- a/.github/workflows/audit.yaml +++ b/.github/workflows/audit.yaml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Rust uses: dtolnay/rust-toolchain@v1 with: diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 9d8453f4..d07ffe5c 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -29,7 +29,7 @@ jobs: target: aarch64-apple-darwin steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Rust toolchain uses: dtolnay/rust-toolchain@v1 with: @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Rust toolchain uses: dtolnay/rust-toolchain@v1 with: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index da717cbe..eefc4d7d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -55,7 +55,7 @@ jobs: sudo apt-get update sudo apt-get install libudev-dev - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Rust toolchain uses: dtolnay/rust-toolchain@stable - name: Enable caching @@ -78,7 +78,7 @@ jobs: sudo apt-get update sudo apt-get install musl-tools libudev-dev - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Rust toolchain uses: dtolnay/rust-toolchain@stable with: From 08d140579ecc7162fe03bd491aa9ab774b088fb5 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 5 Sep 2023 15:20:06 +0200 Subject: [PATCH 112/133] build: Cargo update --- Cargo.lock | 589 ++++++++++++++++++++++------------------------------- 1 file changed, 249 insertions(+), 340 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 04307b8c..a673ac8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,61 +19,49 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", "cpufeatures", ] -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -89,9 +77,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -131,15 +119,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -155,15 +143,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "base64ct" @@ -179,9 +161,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block-buffer" @@ -194,21 +176,20 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "once_cell", - "regex-automata 0.1.10", + "regex-automata", "serde", ] [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byteorder" @@ -245,11 +226,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -270,20 +252,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.21" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.21" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", @@ -293,18 +274,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" +checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", @@ -314,9 +295,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colorchoice" @@ -361,9 +342,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -379,9 +360,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -396,6 +377,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + [[package]] name = "difflib" version = "0.4.0" @@ -404,9 +391,9 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -442,9 +429,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -454,9 +441,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -487,9 +474,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -546,13 +533,13 @@ checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -563,7 +550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -589,9 +576,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -617,6 +604,17 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "futures-sink" version = "0.3.28" @@ -637,6 +635,7 @@ checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-io", + "futures-macro", "futures-task", "memchr", "pin-project-lite", @@ -656,9 +655,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -667,9 +666,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "guess_host_triple" @@ -685,9 +684,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -707,9 +706,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] [[package]] name = "heck" @@ -719,18 +715,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hmac" @@ -771,9 +758,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -783,9 +770,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -807,13 +794,14 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.21.7", + "rustls", "tokio", "tokio-rustls", ] @@ -833,9 +821,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -860,32 +848,20 @@ dependencies = [ "generic-array", ] -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix 0.37.19", + "hermit-abi", + "rustix", "windows-sys 0.48.0", ] @@ -906,9 +882,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -921,9 +897,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -942,21 +918,15 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1023,15 +993,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -1043,14 +1004,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1073,28 +1033,28 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" @@ -1102,7 +1062,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -1130,18 +1090,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.3+1.1.1t" +version = "300.1.3+3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924757a6a226bf60da5f7dd0311a34d2b52283dd82ddeb103208ddc66362f80c" +checksum = "cd2c101a165fff9935e34def4669595ab1c7847943c42be86e21503e482be107" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -1174,15 +1134,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] @@ -1210,24 +1170,24 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", @@ -1236,9 +1196,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1288,18 +1248,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1371,16 +1331,10 @@ checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", + "regex-automata", "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - [[package]] name = "regex-automata" version = "0.3.8" @@ -1404,7 +1358,7 @@ version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.0", + "base64", "bytes", "encoding_rs", "futures-core", @@ -1423,7 +1377,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.7", + "rustls", "rustls-pemfile", "serde", "serde_json", @@ -1472,43 +1426,17 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ - "bitflags 1.3.2", - "errno 0.3.1", - "io-lifetimes", + "bitflags 2.4.0", + "errno 0.3.3", "libc", - "linux-raw-sys 0.3.7", + "linux-raw-sys", "windows-sys 0.48.0", ] -[[package]] -name = "rustix" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" -dependencies = [ - "bitflags 2.3.3", - "errno 0.3.1", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.7" @@ -1517,7 +1445,7 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.4", "sct", ] @@ -1527,7 +1455,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.0", + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -1542,30 +1480,30 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -1579,9 +1517,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.0" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -1592,9 +1530,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -1602,24 +1540,24 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -1662,9 +1600,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -1682,18 +1620,18 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "smawk" @@ -1744,9 +1682,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.0" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9f3bd7d2e45dcc5e265fbb88d6513e4747d8ef9444cf01a533119bce28a157" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" dependencies = [ "heck", "proc-macro2", @@ -1757,9 +1695,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "supports-color" @@ -1791,9 +1729,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.25" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -1820,7 +1758,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.38.4", + "rustix", "windows-sys 0.48.0", ] @@ -1882,10 +1820,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ + "deranged", "serde", "time-core", ] @@ -1968,7 +1907,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.7", + "rustls", "tokio", ] @@ -2032,19 +1971,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" @@ -2083,27 +2018,27 @@ dependencies = [ [[package]] name = "ureq" -version = "2.6.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" dependencies = [ - "base64 0.13.1", + "base64", "flate2", "log", "once_cell", - "rustls 0.20.8", + "rustls", + "rustls-webpki 0.100.2", "serde", "serde_json", "url", - "webpki", - "webpki-roots 0.22.6", + "webpki-roots 0.23.1", ] [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -2139,11 +2074,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -2155,9 +2089,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2165,9 +2099,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", @@ -2180,9 +2114,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2192,9 +2126,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2202,9 +2136,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", @@ -2215,37 +2149,27 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "webpki", + "rustls-webpki 0.100.2", ] [[package]] @@ -2285,21 +2209,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -2315,7 +2224,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -2335,17 +2244,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -2356,9 +2265,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -2368,9 +2277,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -2380,9 +2289,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -2392,9 +2301,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -2404,9 +2313,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -2416,9 +2325,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -2428,9 +2337,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winreg" From 241fd9277518eb20418de13bb7a337fbe6d43a37 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 5 Sep 2023 15:34:40 +0200 Subject: [PATCH 113/133] chore: Bump MSRV --- .github/workflows/ci.yaml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index eefc4d7d..708e216a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -82,7 +82,7 @@ jobs: - name: Setup Rust toolchain uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.65.0 + toolchain: 1.70.0 - name: Enable caching uses: Swatinem/rust-cache@v2 - name: Cargo check diff --git a/README.md b/README.md index c6c4a627..0a741634 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # espup [![Crates.io](https://img.shields.io/crates/v/espup.svg)](https://crates.io/crates/espup) -![MSRV](https://img.shields.io/badge/MSRV-1.65-blue?labelColor=1C2C2E&logo=Rust&style=flat-square) +![MSRV](https://img.shields.io/badge/MSRV-1.70-blue?labelColor=1C2C2E&logo=Rust&style=flat-square) [![Continuous Integration](https://github.com/esp-rs/espup/actions/workflows/ci.yaml/badge.svg)](https://github.com/esp-rs/espup/actions/workflows/ci.yaml) [![Security audit](https://github.com/esp-rs/espup/actions/workflows/audit.yaml/badge.svg)](https://github.com/esp-rs/espup/actions/workflows/audit.yaml) [![Matrix](https://img.shields.io/matrix/esp-rs:matrix.org?label=join%20matrix&color=BEC5C9&labelColor=1C2C2E&logo=matrix&style=flat-square)](https://matrix.to/#/#esp-rs:matrix.org) From b2051bae9703826d9c8b48b4cd59b1fa65f55d20 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 5 Sep 2023 15:37:11 +0200 Subject: [PATCH 114/133] build: Bump clap versions --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 552cc0c9..0ef67a1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ rust-version = "1.65" [dependencies] async-trait = "0.1.73" -clap = { version = "4.3.21", features = ["derive"] } -clap_complete = "4.3.2" +clap = { version = "4.4.2", features = ["derive"] } +clap_complete = "4.4.0" console = "0.15.7" directories = "5.0.1" env_logger = "0.10.0" From da4140063b240a6e74f57af13fc389dfb62b1c89 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Wed, 6 Sep 2023 10:05:21 +0200 Subject: [PATCH 115/133] chore: Bump MSRV --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 0ef67a1c..9d074495 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ Tool for installing and maintaining Espressif Rust ecosystem. """ keywords = ["esp", "esp-rs", "embedded", "cli", "xtensa"] categories = ["command-line-utilities", "development-tools", "embedded"] -rust-version = "1.65" +rust-version = "1.70" [dependencies] async-trait = "0.1.73" From f0148bad2c927fc44fcd563fe506e82093ad3997 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 7 Sep 2023 09:19:51 +0200 Subject: [PATCH 116/133] feat: Begin next release cycle --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a673ac8e..c7e779a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "espup" -version = "0.5.0" +version = "0.5.1-dev" dependencies = [ "assert_cmd", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 9d074495..0643a387 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espup" -version = "0.5.0" +version = "0.5.1-dev" authors = ["Sergio Gasquez Arcos "] edition = "2021" license = "MIT OR Apache-2.0" From 2ac988bfeabbdb327080ef81dace87e93c6eeab0 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 7 Sep 2023 09:14:44 +0200 Subject: [PATCH 117/133] fix: Fix tempdirs cleanup --- src/toolchain/rust.rs | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/toolchain/rust.rs b/src/toolchain/rust.rs index d919d1a4..656558c0 100644 --- a/src/toolchain/rust.rs +++ b/src/toolchain/rust.rs @@ -210,15 +210,12 @@ impl Installable for XtensaRust { #[cfg(unix)] if cfg!(unix) { - let temp_rust_dir = tempfile::TempDir::new() - .unwrap() - .into_path() - .display() - .to_string(); + let rust_dir = tempfile::TempDir::new()?; + let rust_dir_path = &rust_dir.path().display().to_string(); download_file( self.dist_url.clone(), "rust.tar.xz", - &temp_rust_dir, + rust_dir_path, true, false, ) @@ -233,7 +230,7 @@ impl Installable for XtensaRust { .arg("bash") .arg(format!( "{}/rust-nightly-{}/install.sh", - temp_rust_dir, &self.host_triple, + rust_dir_path, &self.host_triple, )) .arg(format!( "--destdir={}", @@ -251,15 +248,12 @@ impl Installable for XtensaRust { return Err(Error::XtensaRust); } - let temp_rust_src_dir = tempfile::TempDir::new() - .unwrap() - .into_path() - .display() - .to_string(); + let rust_src_dir = tempfile::TempDir::new()?; + let rust_src_dir_path = &rust_src_dir.path().display().to_string(); download_file( self.src_dist_url.clone(), "rust-src.tar.xz", - &temp_rust_src_dir, + rust_src_dir_path, true, false, ) @@ -270,7 +264,7 @@ impl Installable for XtensaRust { ); if !Command::new("/usr/bin/env") .arg("bash") - .arg(format!("{}/rust-src-nightly/install.sh", temp_rust_src_dir)) + .arg(format!("{}/rust-src-nightly/install.sh", rust_src_dir_path)) .arg(format!( "--destdir={}", self.toolchain_destination.display() From 5219673fb8b8d787ea69194fb0f208beed01860b Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Tue, 12 Sep 2023 09:27:44 +0200 Subject: [PATCH 118/133] Improve `remove_dir_all` errors (#346) * feat: Improve remove_dir_all errors * feat: Small improvements of download_file fn * feat: Uinstall now deletes everything inside the Xtensa Rust toolchain folder --- src/error.rs | 2 +- src/toolchain/gcc.rs | 3 ++- src/toolchain/llvm.rs | 4 +++- src/toolchain/mod.rs | 6 +++--- src/toolchain/rust.rs | 23 +++++++++++++++-------- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/error.rs b/src/error.rs index 504bd499..4636bec6 100644 --- a/src/error.rs +++ b/src/error.rs @@ -44,7 +44,7 @@ pub enum Error { MissingRust, #[diagnostic(code(espup::remove_directory))] - #[error("{} Failed to remove '{0}' directory.", emoji::ERROR)] + #[error("{} Failed to remove '{0}'.", emoji::ERROR)] RemoveDirectory(String), #[error(transparent)] diff --git a/src/toolchain/gcc.rs b/src/toolchain/gcc.rs index 69fa907a..73eb35e9 100644 --- a/src/toolchain/gcc.rs +++ b/src/toolchain/gcc.rs @@ -179,7 +179,8 @@ pub fn uninstall_gcc_toolchains(toolchain_path: &Path) -> Result<(), Error> { .replace(&format!("{gcc_path};"), ""), ); } - remove_dir_all(gcc_path)?; + remove_dir_all(&gcc_path) + .map_err(|_| Error::RemoveDirectory(gcc_path.display().to_string()))?; } } diff --git a/src/toolchain/llvm.rs b/src/toolchain/llvm.rs index 34155cc4..d117b461 100644 --- a/src/toolchain/llvm.rs +++ b/src/toolchain/llvm.rs @@ -136,7 +136,9 @@ impl Llvm { ); set_environment_variable("PATH", &updated_path)?; } - remove_dir_all(toolchain_path.join(CLANG_NAME))?; + let path = toolchain_path.join(CLANG_NAME); + remove_dir_all(&path) + .map_err(|_| Error::RemoveDirectory(path.display().to_string()))?; } Ok(()) } diff --git a/src/toolchain/mod.rs b/src/toolchain/mod.rs index 706c72b7..b2151eb7 100644 --- a/src/toolchain/mod.rs +++ b/src/toolchain/mod.rs @@ -65,7 +65,7 @@ pub async fn download_file( emoji::WRENCH, output_directory ); - if let Err(_e) = create_dir_all(output_directory) { + if create_dir_all(output_directory).is_err() { return Err(Error::CreateDirectory(output_directory.to_string())); } } @@ -136,10 +136,10 @@ pub async fn download_file( } } else { info!("{} Creating file: '{}'", emoji::WRENCH, file_path); - let mut out = File::create(file_path)?; + let mut out = File::create(&file_path)?; out.write_all(&bytes)?; } - Ok(format!("{output_directory}/{file_name}")) + Ok(file_path) } /// Installs or updates the Espressif Rust ecosystem. diff --git a/src/toolchain/rust.rs b/src/toolchain/rust.rs index 656558c0..7365eec7 100644 --- a/src/toolchain/rust.rs +++ b/src/toolchain/rust.rs @@ -20,7 +20,7 @@ use regex::Regex; use std::{ env, fmt::Debug, - fs::{read_dir, remove_dir_all}, + fs::{read_dir, remove_dir_all, remove_file}, path::{Path, PathBuf}, process::{Command, Stdio}, }; @@ -158,14 +158,21 @@ impl XtensaRust { info!("{} Uninstalling Xtensa Rust toolchain", emoji::WRENCH); let dir = read_dir(toolchain_path)?; for entry in dir { - let subdir_name = entry.unwrap().path().display().to_string(); - if !subdir_name.contains(RISCV_GCC) - && !subdir_name.contains(ESP32_GCC) - && !subdir_name.contains(ESP32S2_GCC) - && !subdir_name.contains(ESP32S3_GCC) - && !subdir_name.contains(CLANG_NAME) + let entry_path = entry.unwrap().path(); + let entry_name = entry_path.display().to_string(); + if !entry_name.contains(RISCV_GCC) + && !entry_name.contains(ESP32_GCC) + && !entry_name.contains(ESP32S2_GCC) + && !entry_name.contains(ESP32S3_GCC) + && !entry_name.contains(CLANG_NAME) { - remove_dir_all(Path::new(&subdir_name)).unwrap(); + if entry_path.is_dir() { + remove_dir_all(Path::new(&entry_name)) + .map_err(|_| Error::RemoveDirectory(entry_name))?; + } else { + // If the entry is a file, delete the file + remove_file(&entry_name)?; + } } } Ok(()) From 9dfc9708c28a2454733fd9ffb535a59c16a3b3c6 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Thu, 14 Sep 2023 08:22:16 +0200 Subject: [PATCH 119/133] Use RUSTUP_HOME tmp folder (#348) * feat: Create tmp folders in Xtensa Rust folder * fix: Fix Windows imports * feat: Use RUSTUP_HOME tmp folder --- src/toolchain/rust.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/toolchain/rust.rs b/src/toolchain/rust.rs index 7365eec7..cca1b3fe 100644 --- a/src/toolchain/rust.rs +++ b/src/toolchain/rust.rs @@ -24,6 +24,8 @@ use std::{ path::{Path, PathBuf}, process::{Command, Stdio}, }; +#[cfg(unix)] +use tempfile::tempdir_in; /// Xtensa Rust Toolchain repository const DEFAULT_XTENSA_RUST_REPOSITORY: &str = @@ -217,12 +219,13 @@ impl Installable for XtensaRust { #[cfg(unix)] if cfg!(unix) { - let rust_dir = tempfile::TempDir::new()?; - let rust_dir_path = &rust_dir.path().display().to_string(); + let tmp_dir = tempdir_in(get_rustup_home().join("tmp"))?; + let tmp_dir_path = &tmp_dir.path().display().to_string(); + download_file( self.dist_url.clone(), "rust.tar.xz", - rust_dir_path, + tmp_dir_path, true, false, ) @@ -237,7 +240,7 @@ impl Installable for XtensaRust { .arg("bash") .arg(format!( "{}/rust-nightly-{}/install.sh", - rust_dir_path, &self.host_triple, + tmp_dir_path, &self.host_triple, )) .arg(format!( "--destdir={}", @@ -255,12 +258,10 @@ impl Installable for XtensaRust { return Err(Error::XtensaRust); } - let rust_src_dir = tempfile::TempDir::new()?; - let rust_src_dir_path = &rust_src_dir.path().display().to_string(); download_file( self.src_dist_url.clone(), "rust-src.tar.xz", - rust_src_dir_path, + tmp_dir_path, true, false, ) @@ -271,7 +272,7 @@ impl Installable for XtensaRust { ); if !Command::new("/usr/bin/env") .arg("bash") - .arg(format!("{}/rust-src-nightly/install.sh", rust_src_dir_path)) + .arg(format!("{}/rust-src-nightly/install.sh", tmp_dir_path)) .arg(format!( "--destdir={}", self.toolchain_destination.display() From a4322009b4418a1395b5903e633ba1916c818cbb Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Thu, 14 Sep 2023 08:56:37 +0200 Subject: [PATCH 120/133] Add a flag to skip Xtensa Rust version parsing (#352) * feat: Add a flag to skip Xtensa Rust version parsing * docs: Update Usage section --- README.md | 48 ++++++++++++++++++++++++++++++++++++++++++++---- src/cli.rs | 10 +++++----- src/main.rs | 17 +++++++++++++++-- 3 files changed, 64 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0a741634..638f7d17 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,9 @@ Options: [default: nightly] + -k, --skip-version-parse + Skips parsing Xtensa Rust version + -s, --std Only install toolchains required for STD applications. @@ -195,15 +198,52 @@ Usage: espup update [OPTIONS] Options: -d, --default-host - Target triple of the host [possible values: x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu, x86_64-pc-windows-msvc, x86_64-pc-windows-gnu, x86_64-apple-darwin, aarch64-apple-darwin] + Target triple of the host + + [possible values: x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu, x86_64-pc-windows-msvc, x86_64-pc-windows-gnu, x86_64-apple-darwin, aarch64-apple-darwin] + + -f, --export-file + Relative or full path for the export file that will be generated. If no path is provided, the file will be generated under home directory (https://docs.rs/dirs/latest/dirs/fn.home_dir.html) + + -e, --extended-llvm + Extends the LLVM installation. + + This will install the whole LLVM instead of only installing the libs. + -l, --log-level - Verbosity level of the logs [default: info] [possible values: debug, info, warn, error] + Verbosity level of the logs + + [default: info] + [possible values: debug, info, warn, error] + -a, --name - Xtensa Rust toolchain name [default: esp] + Xtensa Rust toolchain name + + [default: esp] + + -n, --nightly-version + Nightly Rust toolchain version + + [default: nightly] + + -k, --skip-version-parse + Skips parsing Xtensa Rust version + + -s, --std + Only install toolchains required for STD applications. + + With this option, espup will skip GCC installation (it will be handled by esp-idf-sys), hence you won't be able to build no_std applications. + + -t, --targets + Comma or space separated list of targets [esp32,esp32c2,esp32c3,esp32c6,esp32h2,esp32s2,esp32s3,all] + + [default: all] + -v, --toolchain-version Xtensa Rust toolchain version + -h, --help - Print help + Print help (see a summary with '-h') ``` ## License diff --git a/src/cli.rs b/src/cli.rs index ed2f2483..a24730fe 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -1,7 +1,4 @@ -use crate::{ - targets::{parse_targets, Target}, - toolchain::rust::XtensaRust, -}; +use crate::targets::{parse_targets, Target}; use clap::Parser; use clap_complete::Shell; use std::{collections::HashSet, path::PathBuf}; @@ -37,6 +34,9 @@ pub struct InstallOpts { /// Nightly Rust toolchain version. #[arg(short = 'n', long, default_value = "nightly")] pub nightly_version: String, + /// Skips parsing Xtensa Rust version. + #[arg(short = 'k', long)] + pub skip_version_parse: bool, /// Only install toolchains required for STD applications. /// /// With this option, espup will skip GCC installation (it will be handled by esp-idf-sys), hence you won't be able to build no_std applications. @@ -46,7 +46,7 @@ pub struct InstallOpts { #[arg(short = 't', long, default_value = "all", value_parser = parse_targets)] pub targets: HashSet, /// Xtensa Rust toolchain version. - #[arg(short = 'v', long, value_parser = XtensaRust::parse_version)] + #[arg(short = 'v', long)] pub toolchain_version: Option, } diff --git a/src/main.rs b/src/main.rs index 90ca41a2..9157f0ba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,7 +8,7 @@ use espup::{ logging::initialize_logger, toolchain::{ gcc::uninstall_gcc_toolchains, install as toolchain_install, llvm::Llvm, - rust::get_rustup_home, + rust::get_rustup_home, rust::XtensaRust, }, update::check_for_update, }; @@ -64,6 +64,13 @@ async fn install(args: InstallOpts) -> Result<()> { initialize_logger(&args.log_level); check_for_update(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")); + // Check if the toolchain version is valid if we are not skipping the version parse + if let Some(toolchain_version) = &args.toolchain_version { + if !args.skip_version_parse { + XtensaRust::parse_version(toolchain_version)?; + } + } + info!("{} Installing the Espressif Rust ecosystem", emoji::DISC); toolchain_install(args).await?; info!("{} Installation successfully completed!", emoji::CHECK); @@ -76,7 +83,6 @@ async fn uninstall(args: UninstallOpts) -> Result<()> { check_for_update(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")); info!("{} Uninstalling the Espressif Rust ecosystem", emoji::DISC); - let install_path = get_rustup_home().join("toolchains").join(args.name); Llvm::uninstall(&install_path)?; @@ -103,6 +109,13 @@ async fn update(args: InstallOpts) -> Result<()> { initialize_logger(&args.log_level); check_for_update(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")); + // Check if the toolchain version is valid if we are not skipping the version parse + if let Some(toolchain_version) = &args.toolchain_version { + if !args.skip_version_parse { + XtensaRust::parse_version(toolchain_version)?; + } + } + info!("{} Updating Espressif Rust ecosystem", emoji::DISC); toolchain_install(args).await?; info!("{} Update successfully completed!", emoji::CHECK); From f178e8a84d0f993644105b2b34ed5a7719260ca8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 09:59:32 +0200 Subject: [PATCH 121/133] build(deps): bump clap_complete from 4.4.0 to 4.4.1 (#351) Bumps [clap_complete](https://github.com/clap-rs/clap) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.4.0...clap_complete-v4.4.1) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7e779a5..2cb6ede4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" +checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" dependencies = [ "clap", ] diff --git a/Cargo.toml b/Cargo.toml index 0643a387..c5ca26b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.70" [dependencies] async-trait = "0.1.73" clap = { version = "4.4.2", features = ["derive"] } -clap_complete = "4.4.0" +clap_complete = "4.4.1" console = "0.15.7" directories = "5.0.1" env_logger = "0.10.0" From c620ebfa7fadd2199b2a8c5626b3e866745a69a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 09:59:41 +0200 Subject: [PATCH 122/133] build(deps): bump serde_json from 1.0.105 to 1.0.106 (#350) Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.105 to 1.0.106. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.105...v1.0.106) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2cb6ede4..11323abb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1566,9 +1566,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index c5ca26b7..352dbeea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ miette = { version = "5.10.0", features = ["fancy"] } regex = "1.9.5" reqwest = { version = "0.11.20", features = ["blocking"] } retry = "2.0.0" -serde_json = "1.0.105" +serde_json = "1.0.106" strum = { version = "0.25", features = ["derive"] } tar = "0.4.40" tempfile = "3.8.0" From 69bbc7749a350a06407d0cebb2bad9c4c5f3b40c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 21:38:44 +0000 Subject: [PATCH 123/133] build(deps): bump serde_json from 1.0.106 to 1.0.107 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.106 to 1.0.107. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.106...v1.0.107) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11323abb..f8d7acb2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1566,9 +1566,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 352dbeea..2e7fb79d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ miette = { version = "5.10.0", features = ["fancy"] } regex = "1.9.5" reqwest = { version = "0.11.20", features = ["blocking"] } retry = "2.0.0" -serde_json = "1.0.106" +serde_json = "1.0.107" strum = { version = "0.25", features = ["derive"] } tar = "0.4.40" tempfile = "3.8.0" From 2e1e3a90d816564f2a17219373fb0b224fed1e86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 21:38:36 +0000 Subject: [PATCH 124/133] build(deps): bump clap from 4.4.2 to 4.4.4 Bumps [clap](https://github.com/clap-rs/clap) from 4.4.2 to 4.4.4. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.4.2...v4.4.4) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f8d7acb2..b94dd5b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -252,9 +252,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", "clap_derive", @@ -262,9 +262,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ "anstream", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index 2e7fb79d..c168fbd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.70" [dependencies] async-trait = "0.1.73" -clap = { version = "4.4.2", features = ["derive"] } +clap = { version = "4.4.4", features = ["derive"] } clap_complete = "4.4.1" console = "0.15.7" directories = "5.0.1" From a54c85238f66b26b48168787079c680e5fb03fce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 21:23:16 +0000 Subject: [PATCH 125/133] build(deps): bump clap from 4.4.4 to 4.4.5 Bumps [clap](https://github.com/clap-rs/clap) from 4.4.4 to 4.4.5. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.4.4...v4.4.5) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b94dd5b0..6344886e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -252,9 +252,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.4" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" dependencies = [ "clap_builder", "clap_derive", @@ -262,9 +262,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.4" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" dependencies = [ "anstream", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index c168fbd8..b66da4fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.70" [dependencies] async-trait = "0.1.73" -clap = { version = "4.4.4", features = ["derive"] } +clap = { version = "4.4.5", features = ["derive"] } clap_complete = "4.4.1" console = "0.15.7" directories = "5.0.1" From 5949af565b709b88966faba77ae39a5292c01680 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Wed, 27 Sep 2023 11:35:47 +0200 Subject: [PATCH 126/133] Add CHANGELOG.md (#358) * docs: Add CHANGELOG.md * ci: Ignore changelog updates --- .github/workflows/ci.yaml | 2 ++ CHANGELOG.md | 75 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 CHANGELOG.md diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 708e216a..7a1d81c8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,11 +7,13 @@ on: - main paths-ignore: - "**/README.md" + - "**/CHANGELOG.md" - "**/audit.yaml" - "**/cd.yaml" pull_request: paths-ignore: - "**/README.md" + - "**/CHANGELOG.md" - "**/audit.yaml" - "**/cd.yaml" diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..8b746c76 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,75 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Added +- Add a flag to skip Xtensa Rust version parsing (#352) + +### Changed +- Update dependencies +- Use `RUSTUP_HOME` tmp folder (#348) +- Improve `remove_dir_all` errors (#346) + +### Fixed +- Fix temorary folders/files cleanup (#344) +- Fix Clippy lint (#335) + +### Removed + +## [0.5.0] - 2023-08-11 + +## [0.4.1] - 2023-05-18 + +## [0.4.0] - 2023-04-24 + +## [0.3.2] - 2023-03-13 + +## [0.3.1] - 2023-03-06 + +## [0.3.0] - 2023-02-21 + +## [0.2.9] - 2023-02-14 + +## [0.2.8] - 2023-02-03 + +## [0.2.7] - 2023-02-03 + +## [0.2.6] - 2023-01-13 + +## [0.2.5] - 2023-01-11 + +## [0.2.4] - 2022-12-14 + +## [0.2.3] - 2022-11-17 + +## [0.2.2] - 2022-11-17 + +## [0.2.1] - 2022-11-04 + +## [0.2.0] - 2022-11-03 + +## [0.1.0] - 2022-10-07 + +[unreleased]: https://github.com/esp-rs/espup/compare/v0.5.0...HEAD +[0.5.0]: https://github.com/esp-rs/espup/compare/v0.4.1...v0.5.0 +[0.4.1]: https://github.com/esp-rs/espup/compare/v0.4.0...v0.4.1 +[0.4.0]: https://github.com/esp-rs/espup/compare/v0.3.2...v0.4.0 +[0.3.2]: https://github.com/esp-rs/espup/compare/v0.3.1...v0.3.2 +[0.3.1]: https://github.com/esp-rs/espup/compare/v0.3.0...v0.3.1 +[0.3.0]: https://github.com/esp-rs/espup/compare/v0.2.9...v0.3.0 +[0.2.9]: https://github.com/esp-rs/espup/compare/v0.2.8...v0.2.9 +[0.2.8]: https://github.com/esp-rs/espup/compare/v0.2.7...v0.2.8 +[0.2.7]: https://github.com/esp-rs/espup/compare/v0.2.6...v0.2.7 +[0.2.6]: https://github.com/esp-rs/espup/compare/v0.2.5...v0.2.6 +[0.2.5]: https://github.com/esp-rs/espup/compare/v0.2.4...v0.2.5 +[0.2.4]: https://github.com/esp-rs/espup/compare/v0.2.3...v0.2.4 +[0.2.3]: https://github.com/esp-rs/espup/compare/v0.2.2...v0.2.3 +[0.2.2]: https://github.com/esp-rs/espup/compare/v0.2.1...v0.2.2 +[0.2.1]: https://github.com/esp-rs/espup/compare/v0.2.0...v0.2.1 +[0.2.0]: https://github.com/esp-rs/espup/compare/v0.1.0...v0.2.0 +[0.1.0]: https://github.com/esp-rs/espup/releases/tag/v0.1.0 From f360a79e3ab050c5583d3227faadeea9e5af5cb8 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Mon, 2 Oct 2023 12:09:46 +0200 Subject: [PATCH 127/133] Add warn message when failed to detect Xtensa Rust (#357) * perf: Add warn message when failed to detect Xtensa Rust * style: Format log messages * Add CHANGELOG.md (#358) * docs: Add CHANGELOG.md * ci: Ignore changelog updates * docs: Update changelog --- CHANGELOG.md | 1 + src/env.rs | 8 ++++---- src/error.rs | 12 ++++++------ src/lib.rs | 2 +- src/toolchain/gcc.rs | 2 +- src/toolchain/llvm.rs | 2 +- src/toolchain/mod.rs | 4 ++-- src/toolchain/rust.rs | 8 +++++++- 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b746c76..a57298ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Add a flag to skip Xtensa Rust version parsing (#352) +- Add warn message when failed to detect Xtensa Rust (#357) ### Changed - Update dependencies diff --git a/src/env.rs b/src/env.rs index 9d381b50..84bdb6e1 100644 --- a/src/env.rs +++ b/src/env.rs @@ -87,11 +87,11 @@ pub fn export_environment(export_file: &Path) -> Result<(), Error> { if cfg!(windows) { set_environment_variable("PATH", &env::var("PATH").unwrap())?; warn!( - "{} Your environments variables have been updated! Shell may need to be restarted for changes to be effective.", + "{} Your environments variables have been updated! Shell may need to be restarted for changes to be effective", emoji::INFO ); warn!( - "{} A file was created at '{}' showing the injected environment variables.", + "{} A file was created at '{}' showing the injected environment variables", emoji::INFO, export_file.display() ); @@ -99,12 +99,12 @@ pub fn export_environment(export_file: &Path) -> Result<(), Error> { #[cfg(unix)] if cfg!(unix) { warn!( - "{} Please, set up the environment variables by running: '. {}'", + "{} Please, set up the environment variables by running: ' {}'", emoji::INFO, export_file.display() ); warn!( - "{} This step must be done every time you open a new terminal.", + "{} This step must be done every time you open a new terminal", emoji::WARN ); } diff --git a/src/error.rs b/src/error.rs index 4636bec6..657fb356 100644 --- a/src/error.rs +++ b/src/error.rs @@ -9,19 +9,19 @@ pub enum Error { CreateDirectory(String), #[diagnostic(code(espup::toolchain::rust::query_github))] - #[error("{} Failed to query GitHub API.", emoji::ERROR)] + #[error("{} Failed to query GitHub API", emoji::ERROR)] GithubQuery, #[diagnostic(code(espup::toolchain::rust::install_riscv_target))] #[error( - "{} Failed to Install RISC-V targets for '{0}' toolchain.", + "{} Failed to Install RISC-V targets for '{0}' toolchain", emoji::ERROR )] InstallRiscvTarget(String), #[diagnostic(code(espup::ivalid_destination))] #[error( - "{} Invalid export file destination: '{0}'. Please, use an absolute or releative path (including the file and its extension).", + "{} Invalid export file destination: '{0}'. Please, use an absolute or releative path (including the file and its extension)", emoji::ERROR )] InvalidDestination(String), @@ -44,7 +44,7 @@ pub enum Error { MissingRust, #[diagnostic(code(espup::remove_directory))] - #[error("{} Failed to remove '{0}'.", emoji::ERROR)] + #[error("{} Failed to remove '{0}'", emoji::ERROR)] RemoveDirectory(String), #[error(transparent)] @@ -55,11 +55,11 @@ pub enum Error { RustupDetection(String), #[diagnostic(code(espup::toolchain::rust::serialize_json))] - #[error("{} Failed to serialize json from string.", emoji::ERROR)] + #[error("{} Failed to serialize json from string", emoji::ERROR)] SerializeJson, #[diagnostic(code(espup::toolchain::rust::uninstall_riscv_target))] - #[error("{} Failed to uninstall RISC-V target.", emoji::ERROR)] + #[error("{} Failed to uninstall RISC-V target", emoji::ERROR)] UninstallRiscvTarget, #[diagnostic(code(espup::toolchain::unsupported_file_extension))] diff --git a/src/lib.rs b/src/lib.rs index 4f6db2eb..41ce7db4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -34,7 +34,7 @@ pub mod update { if let Some(version) = informer.check_version().ok().flatten() { warn!( - "{} A new version of {name} ('{version}') is available.", + "{} A new version of {name} ('{version}') is available", emoji::WARN ); } diff --git a/src/toolchain/gcc.rs b/src/toolchain/gcc.rs index 73eb35e9..4e25cfd3 100644 --- a/src/toolchain/gcc.rs +++ b/src/toolchain/gcc.rs @@ -74,7 +74,7 @@ impl Installable for Gcc { debug!("{} GCC path: {}", emoji::DEBUG, self.path.display()); if self.path.exists() { warn!( - "{} Previous installation of GCC exists in: '{}'. Reusing this installation.", + "{} Previous installation of GCC exists in: '{}'. Reusing this installation", emoji::WARN, &self.path.display() ); diff --git a/src/toolchain/llvm.rs b/src/toolchain/llvm.rs index d117b461..d3ee661b 100644 --- a/src/toolchain/llvm.rs +++ b/src/toolchain/llvm.rs @@ -151,7 +151,7 @@ impl Installable for Llvm { if Path::new(&self.path).exists() { warn!( - "{} Previous installation of LLVM exists in: '{}'. Reusing this installation.", + "{} Previous installation of LLVM exists in: '{}'. Reusing this installation", emoji::WARN, self.path.to_str().unwrap() ); diff --git a/src/toolchain/mod.rs b/src/toolchain/mod.rs index b2151eb7..fa98f35c 100644 --- a/src/toolchain/mod.rs +++ b/src/toolchain/mod.rs @@ -54,7 +54,7 @@ pub async fn download_file( let file_path = format!("{output_directory}/{file_name}"); if Path::new(&file_path).exists() { warn!( - "{} File '{}' already exists, deleting it before download.", + "{} File '{}' already exists, deleting it before download", emoji::WARN, file_path ); @@ -271,7 +271,7 @@ pub fn github_query(url: &str) -> Result { ); headers.insert("X-GitHub-Api-Version", "2022-11-28".parse().unwrap()); if let Some(token) = env::var_os("GITHUB_TOKEN") { - debug!("{} Auth header added.", emoji::DEBUG); + debug!("{} Auth header added", emoji::DEBUG); headers.insert( "Authorization", format!("Bearer {}", token.to_string_lossy()) diff --git a/src/toolchain/rust.rs b/src/toolchain/rust.rs index cca1b3fe..1e144699 100644 --- a/src/toolchain/rust.rs +++ b/src/toolchain/rust.rs @@ -200,13 +200,19 @@ impl Installable for XtensaRust { let output = String::from_utf8_lossy(&rustc_version.stdout); if rustc_version.status.success() && output.contains(&self.version) { warn!( - "{} Previous installation of Xtensa Rust {} exists in: '{}'. Reusing this installation.", + "{} Previous installation of Xtensa Rust {} exists in: '{}'. Reusing this installation", emoji::WARN, &self.version, &self.toolchain_destination.display() ); return Ok(vec![]); } else { + if !rustc_version.status.success() { + warn!( + "{} Failed to detect version of Xtensa Rust, reinstalling it", + emoji::WARN + ); + } Self::uninstall(&self.toolchain_destination)?; } } From cfe4ce4db9f1c9b377e3ef0011a7da8d249b8822 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Mon, 2 Oct 2023 14:54:53 +0200 Subject: [PATCH 128/133] build: Prepare release (#359) --- Cargo.lock | 209 ++++++++++++++++++++++++----------------------------- Cargo.toml | 14 ++-- 2 files changed, 102 insertions(+), 121 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6344886e..14a4e281 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,18 +30,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -53,15 +53,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -143,9 +143,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -187,9 +187,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" @@ -199,9 +199,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2" @@ -252,9 +252,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", @@ -262,9 +262,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.1" +version = "4.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" +checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7" dependencies = [ "clap", ] @@ -474,9 +474,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" dependencies = [ "errno-dragonfly", "libc", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "espup" -version = "0.5.1-dev" +version = "0.6.0" dependencies = [ "assert_cmd", "async-trait", @@ -527,9 +527,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" @@ -715,9 +715,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hmac" @@ -873,9 +873,9 @@ checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -912,15 +912,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" [[package]] name = "lock_api" @@ -951,9 +951,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "miette" @@ -1090,9 +1090,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.3+3.1.2" +version = "300.1.5+3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd2c101a165fff9935e34def4669595ab1c7847943c42be86e21503e482be107" +checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" dependencies = [ "cc", ] @@ -1220,9 +1220,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", @@ -1248,9 +1248,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -1325,9 +1325,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", @@ -1337,9 +1337,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -1390,7 +1390,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg 0.50.0", ] @@ -1426,12 +1426,12 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" dependencies = [ "bitflags 2.4.0", - "errno 0.3.3", + "errno 0.3.4", "libc", "linux-raw-sys", "windows-sys 0.48.0", @@ -1445,7 +1445,7 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki 0.101.4", + "rustls-webpki", "sct", ] @@ -1460,19 +1460,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ "ring", "untrusted", @@ -1540,9 +1530,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" [[package]] name = "serde" @@ -1589,9 +1579,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -1600,9 +1590,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1629,15 +1619,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smawk" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" @@ -1651,9 +1641,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -1701,9 +1691,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "supports-color" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" dependencies = [ "is-terminal", "is_ci", @@ -1729,9 +1719,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -1764,9 +1754,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -1800,18 +1790,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", @@ -1820,9 +1810,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ "deranged", "serde", @@ -1831,9 +1821,9 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "tinyvec" @@ -1864,7 +1854,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "windows-sys 0.48.0", ] @@ -1913,9 +1903,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -1959,9 +1949,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" @@ -1971,9 +1961,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" @@ -1992,9 +1982,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "untrusted" @@ -2018,20 +2008,20 @@ dependencies = [ [[package]] name = "ureq" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", - "rustls-webpki 0.100.2", + "rustls-webpki", "serde", "serde_json", "url", - "webpki-roots 0.23.1", + "webpki-roots", ] [[package]] @@ -2163,15 +2153,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", -] - [[package]] name = "webpki-roots" version = "0.25.2" @@ -2196,9 +2177,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] diff --git a/Cargo.toml b/Cargo.toml index b66da4fa..7bb68fb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espup" -version = "0.5.1-dev" +version = "0.6.0" authors = ["Sergio Gasquez Arcos "] edition = "2021" license = "MIT OR Apache-2.0" @@ -9,14 +9,14 @@ repository = "https://github.com/esp-rs/espup" description = """ Tool for installing and maintaining Espressif Rust ecosystem. """ -keywords = ["esp", "esp-rs", "embedded", "cli", "xtensa"] +keywords = ["cli", "embedded", "esp", "esp-rs", "xtensa"] categories = ["command-line-utilities", "development-tools", "embedded"] rust-version = "1.70" [dependencies] async-trait = "0.1.73" -clap = { version = "4.4.5", features = ["derive"] } -clap_complete = "4.4.1" +clap = { version = "4.4.6", features = ["derive"] } +clap_complete = "4.4.3" console = "0.15.7" directories = "5.0.1" env_logger = "0.10.0" @@ -24,14 +24,14 @@ flate2 = "1.0.27" guess_host_triple = "0.1.3" log = "0.4.20" miette = { version = "5.10.0", features = ["fancy"] } -regex = "1.9.5" +regex = "1.9.6" reqwest = { version = "0.11.20", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.107" -strum = { version = "0.25", features = ["derive"] } +strum = { version = "0.25.0", features = ["derive"] } tar = "0.4.40" tempfile = "3.8.0" -thiserror = "1.0.48" +thiserror = "1.0.49" tokio = { version = "1.32.0", features = ["full"] } tokio-retry = "0.3.0" update-informer = "1.1.0" From 130784085f0f79abca3a79c6fd9dc24ee3edce2e Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Mon, 2 Oct 2023 16:03:39 +0200 Subject: [PATCH 129/133] feat: Begin next release cycle (#360) --- CHANGELOG.md | 13 ++++++++++++- Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a57298ec..6dfc58ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +### Changed + +### Fixed + +### Removed + +## [0.6.0] - 2023-10-02 + ### Added - Add a flag to skip Xtensa Rust version parsing (#352) - Add warn message when failed to detect Xtensa Rust (#357) @@ -56,7 +66,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.1.0] - 2022-10-07 -[unreleased]: https://github.com/esp-rs/espup/compare/v0.5.0...HEAD +[unreleased]: https://github.com/esp-rs/espup/compare/v0.6.0...HEAD +[0.6.0]: https://github.com/esp-rs/espup/compare/v0.5.0...v0.6.0 [0.5.0]: https://github.com/esp-rs/espup/compare/v0.4.1...v0.5.0 [0.4.1]: https://github.com/esp-rs/espup/compare/v0.4.0...v0.4.1 [0.4.0]: https://github.com/esp-rs/espup/compare/v0.3.2...v0.4.0 diff --git a/Cargo.lock b/Cargo.lock index 14a4e281..f7a84880 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "espup" -version = "0.6.0" +version = "0.6.1-dev" dependencies = [ "assert_cmd", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 7bb68fb4..84dc576a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espup" -version = "0.6.0" +version = "0.6.1-dev" authors = ["Sergio Gasquez Arcos "] edition = "2021" license = "MIT OR Apache-2.0" From 02ac04696f8c05017f53a6c6df0224bc6dcccc17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 09:51:40 +0200 Subject: [PATCH 130/133] build(deps): bump reqwest from 0.11.20 to 0.11.21 (#361) Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.20 to 0.11.21. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.20...v0.11.21) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 26 ++++++++++++++++++++++++-- Cargo.toml | 2 +- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f7a84880..4a4ea86f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1354,9 +1354,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "78fdbab6a7e1d7b13cc8ff10197f47986b41c639300cc3c8158cac7847c9bbef" dependencies = [ "base64", "bytes", @@ -1382,6 +1382,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -1728,6 +1729,27 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tar" version = "0.4.40" diff --git a/Cargo.toml b/Cargo.toml index 84dc576a..798fe02d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ guess_host_triple = "0.1.3" log = "0.4.20" miette = { version = "5.10.0", features = ["fancy"] } regex = "1.9.6" -reqwest = { version = "0.11.20", features = ["blocking"] } +reqwest = { version = "0.11.21", features = ["blocking"] } retry = "2.0.0" serde_json = "1.0.107" strum = { version = "0.25.0", features = ["derive"] } From 801d2c20d7a8763eaadc60577eaac4baca0c5604 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 3 Oct 2023 13:27:13 +0000 Subject: [PATCH 131/133] fix: Create $RUSTUP_HOME/tmp if needed --- src/toolchain/rust.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/toolchain/rust.rs b/src/toolchain/rust.rs index 1e144699..285d1b71 100644 --- a/src/toolchain/rust.rs +++ b/src/toolchain/rust.rs @@ -20,7 +20,7 @@ use regex::Regex; use std::{ env, fmt::Debug, - fs::{read_dir, remove_dir_all, remove_file}, + fs::{create_dir_all, read_dir, remove_dir_all, remove_file}, path::{Path, PathBuf}, process::{Command, Stdio}, }; @@ -225,7 +225,13 @@ impl Installable for XtensaRust { #[cfg(unix)] if cfg!(unix) { - let tmp_dir = tempdir_in(get_rustup_home().join("tmp"))?; + let path = get_rustup_home().join("tmp"); + if !path.exists() { + info!("{} Creating directory: '{}'", emoji::WRENCH, path.display()); + create_dir_all(&path) + .map_err(|_| Error::CreateDirectory(path.display().to_string()))?; + } + let tmp_dir = tempdir_in(path)?; let tmp_dir_path = &tmp_dir.path().display().to_string(); download_file( From b69d87a4594fe2571cfb0fdfa928320c5d62f521 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 3 Oct 2023 13:27:34 +0000 Subject: [PATCH 132/133] style: Simplify create_dir_all error --- src/toolchain/mod.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/toolchain/mod.rs b/src/toolchain/mod.rs index fa98f35c..7f22e762 100644 --- a/src/toolchain/mod.rs +++ b/src/toolchain/mod.rs @@ -65,9 +65,8 @@ pub async fn download_file( emoji::WRENCH, output_directory ); - if create_dir_all(output_directory).is_err() { - return Err(Error::CreateDirectory(output_directory.to_string())); - } + create_dir_all(output_directory) + .map_err(|_| Error::CreateDirectory(output_directory.to_string()))?; } info!( "{} Downloading file '{}' from '{}'", From a2f498cb5cc54925b6b5f3032fa10b42fdcca964 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 3 Oct 2023 13:28:49 +0000 Subject: [PATCH 133/133] docs: Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dfc58ad..0fad7f9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### Fixed +- Create $RUSTUP_HOME/tmp if needed (#365) ### Removed