diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:41 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:41 +0000 |
commit | 4f9fe856a25ab29345b90e7725509e9ee38a37be (patch) | |
tree | e4ffd8a9374cae7b21f7cbfb352927e0e074aff6 /vendor/xshell | |
parent | Adding upstream version 1.68.2+dfsg1. (diff) | |
download | rustc-4f9fe856a25ab29345b90e7725509e9ee38a37be.tar.xz rustc-4f9fe856a25ab29345b90e7725509e9ee38a37be.zip |
Adding upstream version 1.69.0+dfsg1.upstream/1.69.0+dfsg1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | vendor/xshell-macros/.cargo-checksum.json | 2 | ||||
-rw-r--r-- | vendor/xshell-macros/Cargo.toml | 2 | ||||
-rw-r--r-- | vendor/xshell/.cargo-checksum.json | 2 | ||||
-rw-r--r-- | vendor/xshell/CHANGELOG.md | 4 | ||||
-rw-r--r-- | vendor/xshell/Cargo.lock | 10 | ||||
-rw-r--r-- | vendor/xshell/Cargo.toml | 4 | ||||
-rw-r--r-- | vendor/xshell/src/lib.rs | 5 |
7 files changed, 15 insertions, 14 deletions
diff --git a/vendor/xshell-macros/.cargo-checksum.json b/vendor/xshell-macros/.cargo-checksum.json index 5198d9797..d909058ce 100644 --- a/vendor/xshell-macros/.cargo-checksum.json +++ b/vendor/xshell-macros/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"4c4a333e83824134161380aa9efb26335313dbca9f09e6a7160d53ce4c2f6918","src/lib.rs":"d91daf4306a265ab7343600f8bab807e059de30c04b9e0494faec45404a7efaa"},"package":"88301b56c26dd9bf5c43d858538f82d6f3f7764767defbc5d34e59459901c41a"}
\ No newline at end of file +{"files":{"Cargo.toml":"710b08bcced4154e543123ae84063e615d944d16746ec63c9c55a842223f8aaf","src/lib.rs":"d91daf4306a265ab7343600f8bab807e059de30c04b9e0494faec45404a7efaa"},"package":"1dbabb1cbd15a1d6d12d9ed6b35cc6777d4af87ab3ba155ea37215f20beab80c"}
\ No newline at end of file diff --git a/vendor/xshell-macros/Cargo.toml b/vendor/xshell-macros/Cargo.toml index c95f0be33..190b1bf88 100644 --- a/vendor/xshell-macros/Cargo.toml +++ b/vendor/xshell-macros/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.59" name = "xshell-macros" -version = "0.2.2" +version = "0.2.3" authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"] description = "Private implementation detail of xshell crate" license = "MIT OR Apache-2.0" diff --git a/vendor/xshell/.cargo-checksum.json b/vendor/xshell/.cargo-checksum.json index dd079af53..bb849f85b 100644 --- a/vendor/xshell/.cargo-checksum.json +++ b/vendor/xshell/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CHANGELOG.md":"dd08a5079cd2e437eb1269f7c60be9c05ce97db407dbb95a631d64c0f1c478a1","Cargo.lock":"f8f5019959ed5fcd772c3cf199220be41ce1e7b2b9a35b153c52f9c8f3a35171","Cargo.toml":"04a9cad4d6a6e7c756c35d3ba776334f0c47b895e54f7006a27617430c84b25f","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"a480b1b8b943c633c64ce9c215f8ecea24e58c7242fe4605d37e7a3be810ab9f","examples/ci.rs":"d5fbfc199469c08f3d459164c05a85c1a0a8f1bef625b347533ad7a43c1e97fb","examples/clone_and_publish.rs":"94568ef665e65527417bb5d50b0404bc60d6a72942d70260c8f3ce1a99820077","src/error.rs":"9222d0b21a889c9fbac1d285c6d43573be9c94f0ea5c02b4bd692bdc02753b49","src/lib.rs":"61d7c1dcd569e60188baba51521661c177bff5a27bcf5272bd83f06542c2304a","tests/compile_time.rs":"224f3476eff4070fbd62c1974e7e69996efd92263bc12f7ddbd59823d85484da","tests/data/xecho.rs":"7a82252daade541bc3843fffa617fc50bf2faf7eebc55e4442a0bc9bb59182fd","tests/it/compile_failures.rs":"c87a438583c9f4b4e45a7422df3ee7c6bd5e69150eba5468425c63aa70fa47d3","tests/it/env.rs":"e863965669378e603c36186e1c738914e3d2300cbe3b04288a9ed689edcf09fb","tests/it/main.rs":"1bb089455f92d6486bf80502ebbbd1f136248194b9c454949f21ed279ea58028","tests/it/tidy.rs":"f530cf51504d43716e849ac96fb64a3a6ef80bd3e56b6eb1bd7b5325dc2f2de9"},"package":"6d47097dc5c85234b1e41851b3422dd6d19b3befdd35b4ae5ce386724aeca981"}
\ No newline at end of file +{"files":{"CHANGELOG.md":"c6e15e05c13991d47bbbd21c1fad9005c14de8dfca06a10c860fa1c70f1e069b","Cargo.lock":"1ee8c4b1409e8fecca09396a23d5199a29b04e6f710d04f0d4b5264279a6cb3c","Cargo.toml":"a4617f00daab17b57f080dff8b331d3847433a4fa65b30945d109df0aad6680b","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"a480b1b8b943c633c64ce9c215f8ecea24e58c7242fe4605d37e7a3be810ab9f","examples/ci.rs":"d5fbfc199469c08f3d459164c05a85c1a0a8f1bef625b347533ad7a43c1e97fb","examples/clone_and_publish.rs":"94568ef665e65527417bb5d50b0404bc60d6a72942d70260c8f3ce1a99820077","src/error.rs":"9222d0b21a889c9fbac1d285c6d43573be9c94f0ea5c02b4bd692bdc02753b49","src/lib.rs":"8bc6f4eab9734a46a717718001a79825a50874da324bb405b29adb17c6e2f220","tests/compile_time.rs":"224f3476eff4070fbd62c1974e7e69996efd92263bc12f7ddbd59823d85484da","tests/data/xecho.rs":"7a82252daade541bc3843fffa617fc50bf2faf7eebc55e4442a0bc9bb59182fd","tests/it/compile_failures.rs":"c87a438583c9f4b4e45a7422df3ee7c6bd5e69150eba5468425c63aa70fa47d3","tests/it/env.rs":"e863965669378e603c36186e1c738914e3d2300cbe3b04288a9ed689edcf09fb","tests/it/main.rs":"1bb089455f92d6486bf80502ebbbd1f136248194b9c454949f21ed279ea58028","tests/it/tidy.rs":"f530cf51504d43716e849ac96fb64a3a6ef80bd3e56b6eb1bd7b5325dc2f2de9"},"package":"962c039b3a7b16cf4e9a4248397c6585c07547412e7d6a6e035389a802dcfe90"}
\ No newline at end of file diff --git a/vendor/xshell/CHANGELOG.md b/vendor/xshell/CHANGELOG.md index cbef62a3e..997a28d3c 100644 --- a/vendor/xshell/CHANGELOG.md +++ b/vendor/xshell/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.2.3 + +- Fix bug where `Cmd::run` would ignore specified stdin. + ## 0.2.2 - Add `Shell::path_exists`. diff --git a/vendor/xshell/Cargo.lock b/vendor/xshell/Cargo.lock index 1ea0d8ff2..bcea12812 100644 --- a/vendor/xshell/Cargo.lock +++ b/vendor/xshell/Cargo.lock @@ -4,13 +4,13 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.57" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "xshell" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anyhow", "xshell-macros", @@ -18,6 +18,6 @@ dependencies = [ [[package]] name = "xshell-macros" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88301b56c26dd9bf5c43d858538f82d6f3f7764767defbc5d34e59459901c41a" +checksum = "1dbabb1cbd15a1d6d12d9ed6b35cc6777d4af87ab3ba155ea37215f20beab80c" diff --git a/vendor/xshell/Cargo.toml b/vendor/xshell/Cargo.toml index f4fb7cff2..781152f51 100644 --- a/vendor/xshell/Cargo.toml +++ b/vendor/xshell/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.59" name = "xshell" -version = "0.2.2" +version = "0.2.3" authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"] exclude = [".github/", "bors.toml", "rustfmt.toml", "cbench", "mock_bin/"] description = "Utilities for quick shell scripting in Rust" @@ -22,6 +22,6 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/matklad/xshell" resolver = "2" [dependencies.xshell-macros] -version = "=0.2.2" +version = "=0.2.3" [dev-dependencies.anyhow] version = "1.0.56" diff --git a/vendor/xshell/src/lib.rs b/vendor/xshell/src/lib.rs index 6b980ba22..02d6276f1 100644 --- a/vendor/xshell/src/lib.rs +++ b/vendor/xshell/src/lib.rs @@ -960,10 +960,7 @@ impl<'a> Cmd<'a> { if !self.data.quiet { eprintln!("$ {}", self); } - let mut command = self.to_command(); - let status = command.status().map_err(|err| Error::new_cmd_io(self, err))?; - self.check_status(status)?; - Ok(()) + self.output_impl(false, false).map(|_| ()) } /// Run the command and return its stdout as a string. |