Merge pull request #445 from tgonzalezorlandoarm/tg/main-update-msrv-…

…1.66.0

Update MSRV 1.66.0

.clippy.toml

@@ -1 +1 @@
-msrv = "1.60.0"
+msrv = "1.66.0"

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Build the container
         run: docker build -t ubuntucontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-ubuntu
       - name: Run the container
-        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
+        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --env RUST_TOOLCHAIN_VERSION=1.66.0 ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/all-ubuntu.sh
   # All in one job as I think it is a big overhead to build and run the Docker
   # container?
   tests-ubuntu:

README.md

@@ -9,7 +9,7 @@ At the moment we test (via CI) and support the following Rust compiler versions:
 
 * On Ubuntu we test with:
     - The latest stable compiler version, as accessible through `rustup`.
-    - The 1.60 compiler version.
+    - The 1.66 compiler version.
 * On Fedora we test with the compiler version included with the Fedora 35 release.
 
 If you need support for other versions of the compiler, get in touch with us to see what we can do!

tss-esapi-sys/Cargo.toml

@@ -16,7 +16,6 @@ links = "tss2-esys"
 bindgen = { version = "0.63.0", optional = true }
 pkg-config = "0.3.18"
 target-lexicon = "0.12.0"
-rustversion = "1.0.14"
 
 [features]
 generate-bindings = ["bindgen"]

tss-esapi-sys/build.rs

@@ -58,7 +58,6 @@ fn main() {
 }
 
 #[cfg(feature = "generate-bindings")]
-#[rustversion::attr(since(1.66), allow(clippy::uninlined_format_args))]
 pub fn generate_from_system(esapi_out: PathBuf) {
     pkg_config::Config::new()
         .atleast_version(MINIMUM_VERSION)

tss-esapi/Cargo.toml

@@ -32,15 +32,13 @@ picky-asn1-x509 = { version = "0.11.0", optional = true }
 cfg-if = "1.0.0"
 strum = { version = "0.25.0", optional = true }
 strum_macros = { version = "0.25.0", optional = true }
-rustversion = "1.0.14"
 
 [dev-dependencies]
 env_logger = "0.9.0"
 sha2 = "0.10.1"
 
 [build-dependencies]
 semver = "1.0.7"
-rustversion = "1.0.14"
 
 [features]
 default = ["abstraction"]

tss-esapi/build.rs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 use semver::{Version, VersionReq};
 
-#[rustversion::attr(since(1.66), allow(clippy::uninlined_format_args))]
 fn main() {
     let tss_version_string = std::env::var("DEP_TSS2_ESYS_VERSION")
         .expect("Failed to parse ENV variable DEP_TSS2_ESYS_VERSION as string");

tss-esapi/src/lib.rs

@@ -58,7 +58,7 @@
 //! are at most one level away from root.
 //!
 //! Minimum supported Rust version (MSRV):
-//! We currently check with version 1.53.0 of the Rust compiler during CI builds.
+//! We currently check with version 1.66.0 of the Rust compiler during CI builds.
 //!
 //! # Notes on code safety:
 //! * thread safety is ensured by the required mutability of the `Context` structure within the

tss-esapi/src/tcti_ldr.rs

@@ -165,7 +165,6 @@ impl TctiNameConf {
     }
 }
 
-#[rustversion::attr(since(1.66), allow(clippy::uninlined_format_args))]
 impl TryFrom<TctiNameConf> for CString {
     type Error = Error;
 
@@ -627,19 +626,13 @@ impl FromStr for TabrmdConfig {
 }
 
 /// DBus type for usage with TABRMD
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
 pub enum BusType {
+    #[default]
     System,
     Session,
 }
 
-#[allow(clippy::derivable_impls)] // Remove this when MSRV is higher then 1.57
-impl Default for BusType {
-    fn default() -> Self {
-        BusType::System
-    }
-}
-
 impl FromStr for BusType {
     type Err = Error;