From 67bf76b76dd9132a90ae4edd052c3d0b3675464f Mon Sep 17 00:00:00 2001 From: Magic Len Date: Mon, 20 Nov 2023 22:14:50 +0800 Subject: [PATCH] update generic-array and also MSRV --- .github/workflows/ci-version.yml | 2 +- .github/workflows/ci.yml | 2 +- execute-command-macro-impl/Cargo.toml | 4 ++-- execute-command-macro/Cargo.toml | 4 ++-- execute-command-tokens/Cargo.toml | 4 ++-- execute/Cargo.toml | 6 +++--- execute/src/lib.rs | 18 ++++++++---------- 7 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci-version.yml b/.github/workflows/ci-version.yml index 3860b33..ec2b873 100644 --- a/.github/workflows/ci-version.yml +++ b/.github/workflows/ci-version.yml @@ -39,7 +39,7 @@ jobs: - macos-latest - windows-latest toolchain: - - 1.56 + - 1.65 name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }}) runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec6df8f..a365743 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: - macos-latest - windows-latest toolchain: - - 1.56 + - 1.65 features: - name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }}) diff --git a/execute-command-macro-impl/Cargo.toml b/execute-command-macro-impl/Cargo.toml index 53a289f..a02390f 100644 --- a/execute-command-macro-impl/Cargo.toml +++ b/execute-command-macro-impl/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "execute-command-macro-impl" -version = "0.1.9" +version = "0.1.10" authors = ["Magic Len "] edition = "2021" -rust-version = "1.56" +rust-version = "1.65" repository = "https://github.com/magiclen/execute" homepage = "https://magiclen.org/execute" keywords = ["execute", "command"] diff --git a/execute-command-macro/Cargo.toml b/execute-command-macro/Cargo.toml index fde0157..b3864ff 100644 --- a/execute-command-macro/Cargo.toml +++ b/execute-command-macro/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "execute-command-macro" -version = "0.1.8" -rust-version = "1.56" +version = "0.1.9" +rust-version = "1.65" authors = ["Magic Len "] edition = "2021" repository = "https://github.com/magiclen/execute" diff --git a/execute-command-tokens/Cargo.toml b/execute-command-tokens/Cargo.toml index 3fed26b..4f75bb5 100644 --- a/execute-command-tokens/Cargo.toml +++ b/execute-command-tokens/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "execute-command-tokens" -version = "0.1.6" +version = "0.1.7" authors = ["Magic Len "] edition = "2021" -rust-version = "1.56" +rust-version = "1.65" repository = "https://github.com/magiclen/execute" homepage = "https://magiclen.org/execute" keywords = ["execute", "command"] diff --git a/execute/Cargo.toml b/execute/Cargo.toml index b90c6a6..5f0eac4 100644 --- a/execute/Cargo.toml +++ b/execute/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "execute" -version = "0.2.12" +version = "0.2.13" authors = ["Magic Len "] edition = "2021" -rust-version = "1.56" +rust-version = "1.65" repository = "https://github.com/magiclen/execute" homepage = "https://magiclen.org/execute" keywords = ["execute", "redirect", "process", "command", "pipe"] @@ -16,4 +16,4 @@ include = ["src/**/*", "Cargo.toml", "README.md", "LICENSE"] execute-command-tokens = { version = "0.1", path = "../execute-command-tokens" } execute-command-macro = { version = "0.1.1", path = "../execute-command-macro" } -generic-array = "0.14.1" \ No newline at end of file +generic-array = "1" \ No newline at end of file diff --git a/execute/src/lib.rs b/execute/src/lib.rs index 5f775e8..563fa1c 100644 --- a/execute/src/lib.rs +++ b/execute/src/lib.rs @@ -351,7 +351,7 @@ pub trait Execute { } /// Execute this command and input data from a reader to the process. stdin will be set to `Stdio::piped()`. stdout and stderr will be set to `Stdio::null()`. - fn execute_input_reader2 + IsGreaterOrEqual>( + fn execute_input_reader2>( &mut self, reader: &mut dyn Read, ) -> Result, io::Error>; @@ -363,7 +363,7 @@ pub trait Execute { } /// Execute this command and input data from a reader to the process. stdin will be set to `Stdio::piped()`. By default, stdout and stderr are inherited from the parent. - fn execute_input_reader_output2 + IsGreaterOrEqual>( + fn execute_input_reader_output2>( &mut self, reader: &mut dyn Read, ) -> Result; @@ -402,7 +402,7 @@ pub trait Execute { } /// Execute this command as well as other commands and pipe their stdin and stdout, and input data from a reader to the process, and get the exit status code. The stdin of the first process will be set to `Stdio::piped()`. The stdout and stderr of the last process will be set to `Stdio::null()`. - fn execute_multiple_input_reader2 + IsGreaterOrEqual>( + fn execute_multiple_input_reader2>( &mut self, reader: &mut dyn Read, others: &mut [&mut Command], @@ -419,9 +419,7 @@ pub trait Execute { } /// Execute this command as well as other commands and pipe their stdin and stdout, and input data from a reader to the process. The stdin of the first process will be set to `Stdio::piped()`. By default, the stdout and stderr of the last process are inherited from the parent. - fn execute_multiple_input_reader_output2< - N: ArrayLength + IsGreaterOrEqual, - >( + fn execute_multiple_input_reader_output2>( &mut self, reader: &mut dyn Read, others: &mut [&mut Command], @@ -473,7 +471,7 @@ impl Execute for Command { } #[inline] - fn execute_input_reader2 + IsGreaterOrEqual>( + fn execute_input_reader2>( &mut self, reader: &mut dyn Read, ) -> Result, io::Error> { @@ -502,7 +500,7 @@ impl Execute for Command { } #[inline] - fn execute_input_reader_output2 + IsGreaterOrEqual>( + fn execute_input_reader_output2>( &mut self, reader: &mut dyn Read, ) -> Result { @@ -657,7 +655,7 @@ impl Execute for Command { last_other.spawn()?.wait_with_output() } - fn execute_multiple_input_reader2 + IsGreaterOrEqual>( + fn execute_multiple_input_reader2>( &mut self, reader: &mut dyn Read, others: &mut [&mut Command], @@ -707,7 +705,7 @@ impl Execute for Command { } fn execute_multiple_input_reader_output2< - N: ArrayLength + IsGreaterOrEqual, + N: ArrayLength + IsGreaterOrEqual, >( &mut self, reader: &mut dyn Read,