Skip to content

Commit 8c8b220

Browse files
committed
Bump MSRV and fix clippy lints
Bumping MSRV to 1.60.0 as required for the picky-asn1 crate. Also setting the MSRV for clippy and fixing some of the remaining warnings. Some of the things clippy complains about for newer versions of the compiler can be fixed/changed without losing support for older compiler versions, but some features are incompatible. Since clippy is now configured to understand the MSRV, there's also no need for some of the `allow` attributes. Signed-off-by: Ionut Mihalcea <[email protected]>
1 parent e44eced commit 8c8b220

File tree

11 files changed

+805
-11
lines changed

11 files changed

+805
-11
lines changed

.clippy.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
msrv = "1.60.0"

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Build the container
3333
run: docker build -t ubuntucontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-ubuntu
3434
- name: Run the container
35-
run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --env RUST_TOOLCHAIN_VERSION=1.57.0 ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/all-ubuntu.sh
35+
run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --env RUST_TOOLCHAIN_VERSION=1.60.0 ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/all-ubuntu.sh
3636
# All in one job as I think it is a big overhead to build and run the Docker
3737
# container?
3838
tests-ubuntu:

tss-esapi-sys/build.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ fn main() {
5757
}
5858
}
5959

60-
#[allow(clippy::uninlined_format_args)]
6160
#[cfg(feature = "generate-bindings")]
6261
pub fn generate_from_system(esapi_out: PathBuf) {
6362
pkg_config::Config::new()

tss-esapi/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ regex = "1.3.9"
2424
zeroize = { version = "1.1.0", features = ["zeroize_derive"] }
2525
tss-esapi-sys = { path = "../tss-esapi-sys", version = "0.4.0" }
2626
oid = "0.2.1"
27-
picky-asn1 = "0.7.2"
28-
picky-asn1-x509 = "0.11.0"
27+
picky-asn1 = "0.5.0"
28+
picky-asn1-x509 = "0.7.1"
2929

3030
[dev-dependencies]
3131
env_logger = "0.9.0"

tss-esapi/src/tcti_ldr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ impl TctiNameConf {
166166
}
167167
}
168168

169-
#[allow(clippy::uninlined_format_args)]
170169
impl TryFrom<TctiNameConf> for CString {
171170
type Error = Error;
172171

0 commit comments

Comments
 (0)