Skip to content

Commit

Permalink
update generic-array and also MSRV
Browse files Browse the repository at this point in the history
  • Loading branch information
magiclen committed Nov 20, 2023
1 parent fb4a5e4 commit 67bf76b
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- macos-latest
- windows-latest
toolchain:
- 1.56
- 1.65
features:
-
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})
Expand Down
4 changes: 2 additions & 2 deletions execute-command-macro-impl/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "execute-command-macro-impl"
version = "0.1.9"
version = "0.1.10"
authors = ["Magic Len <[email protected]>"]
edition = "2021"
rust-version = "1.56"
rust-version = "1.65"
repository = "https://github.com/magiclen/execute"
homepage = "https://magiclen.org/execute"
keywords = ["execute", "command"]
Expand Down
4 changes: 2 additions & 2 deletions execute-command-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
edition = "2021"
repository = "https://github.com/magiclen/execute"
Expand Down
4 changes: 2 additions & 2 deletions execute-command-tokens/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "execute-command-tokens"
version = "0.1.6"
version = "0.1.7"
authors = ["Magic Len <[email protected]>"]
edition = "2021"
rust-version = "1.56"
rust-version = "1.65"
repository = "https://github.com/magiclen/execute"
homepage = "https://magiclen.org/execute"
keywords = ["execute", "command"]
Expand Down
6 changes: 3 additions & 3 deletions execute/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "execute"
version = "0.2.12"
version = "0.2.13"
authors = ["Magic Len <[email protected]>"]
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"]
Expand All @@ -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"
generic-array = "1"
18 changes: 8 additions & 10 deletions execute/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<N: ArrayLength<u8> + IsGreaterOrEqual<U1, Output = True>>(
fn execute_input_reader2<N: ArrayLength + IsGreaterOrEqual<U1, Output = True>>(
&mut self,
reader: &mut dyn Read,
) -> Result<Option<i32>, io::Error>;
Expand All @@ -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<N: ArrayLength<u8> + IsGreaterOrEqual<U1, Output = True>>(
fn execute_input_reader_output2<N: ArrayLength + IsGreaterOrEqual<U1, Output = True>>(
&mut self,
reader: &mut dyn Read,
) -> Result<Output, io::Error>;
Expand Down Expand Up @@ -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<N: ArrayLength<u8> + IsGreaterOrEqual<U1, Output = True>>(
fn execute_multiple_input_reader2<N: ArrayLength + IsGreaterOrEqual<U1, Output = True>>(
&mut self,
reader: &mut dyn Read,
others: &mut [&mut Command],
Expand All @@ -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<u8> + IsGreaterOrEqual<U1, Output = True>,
>(
fn execute_multiple_input_reader_output2<N: ArrayLength + IsGreaterOrEqual<U1, Output = True>>(
&mut self,
reader: &mut dyn Read,
others: &mut [&mut Command],
Expand Down Expand Up @@ -473,7 +471,7 @@ impl Execute for Command {
}

#[inline]
fn execute_input_reader2<N: ArrayLength<u8> + IsGreaterOrEqual<U1, Output = True>>(
fn execute_input_reader2<N: ArrayLength + IsGreaterOrEqual<U1, Output = True>>(
&mut self,
reader: &mut dyn Read,
) -> Result<Option<i32>, io::Error> {
Expand Down Expand Up @@ -502,7 +500,7 @@ impl Execute for Command {
}

#[inline]
fn execute_input_reader_output2<N: ArrayLength<u8> + IsGreaterOrEqual<U1, Output = True>>(
fn execute_input_reader_output2<N: ArrayLength + IsGreaterOrEqual<U1, Output = True>>(
&mut self,
reader: &mut dyn Read,
) -> Result<Output, io::Error> {
Expand Down Expand Up @@ -657,7 +655,7 @@ impl Execute for Command {
last_other.spawn()?.wait_with_output()
}

fn execute_multiple_input_reader2<N: ArrayLength<u8> + IsGreaterOrEqual<U1, Output = True>>(
fn execute_multiple_input_reader2<N: ArrayLength + IsGreaterOrEqual<U1, Output = True>>(
&mut self,
reader: &mut dyn Read,
others: &mut [&mut Command],
Expand Down Expand Up @@ -707,7 +705,7 @@ impl Execute for Command {
}

fn execute_multiple_input_reader_output2<
N: ArrayLength<u8> + IsGreaterOrEqual<U1, Output = True>,
N: ArrayLength + IsGreaterOrEqual<U1, Output = True>,
>(
&mut self,
reader: &mut dyn Read,
Expand Down

0 comments on commit 67bf76b

Please sign in to comment.