Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MSRV 1.66.0 #445

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.60.0"
msrv = "1.66.0"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
1 change: 0 additions & 1 deletion tss-esapi-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
1 change: 0 additions & 1 deletion tss-esapi-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions tss-esapi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
1 change: 0 additions & 1 deletion tss-esapi/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion tss-esapi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 2 additions & 9 deletions tss-esapi/src/tcti_ldr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ impl TctiNameConf {
}
}

#[rustversion::attr(since(1.66), allow(clippy::uninlined_format_args))]
impl TryFrom<TctiNameConf> for CString {
type Error = Error;

Expand Down Expand Up @@ -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;

Expand Down
Loading