Skip to content

Commit

Permalink
Merge pull request #444 from tgonzalezorlandoarm/tg/update-msrv-1.66.0
Browse files Browse the repository at this point in the history
Update MSRV to 1.66.0
  • Loading branch information
tgonzalezorlandoarm authored Oct 5, 2023
2 parents aa3c821 + fc8c4e3 commit d6cdfc1
Show file tree
Hide file tree
Showing 6 changed files with 333 additions and 314 deletions.
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 @@ -32,7 +32,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.57 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
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
9 changes: 2 additions & 7 deletions tss-esapi/src/tcti_ldr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -556,18 +556,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,
}

impl Default for BusType {
fn default() -> Self {
BusType::System
}
}

impl FromStr for BusType {
type Err = Error;

Expand Down
Loading

0 comments on commit d6cdfc1

Please sign in to comment.