Skip to content

Commit d6cdfc1

Browse files
Merge pull request #444 from tgonzalezorlandoarm/tg/update-msrv-1.66.0
Update MSRV to 1.66.0
2 parents aa3c821 + fc8c4e3 commit d6cdfc1

File tree

6 files changed

+333
-314
lines changed

6 files changed

+333
-314
lines changed

.clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.60.0"
1+
msrv = "1.66.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.60.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.66.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:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ At the moment we test (via CI) and support the following Rust compiler versions:
99

1010
* On Ubuntu we test with:
1111
- The latest stable compiler version, as accessible through `rustup`.
12-
- The 1.57 compiler version.
12+
- The 1.66 compiler version.
1313
* On Fedora we test with the compiler version included with the Fedora 35 release.
1414

1515
If you need support for other versions of the compiler, get in touch with us to see what we can do!

tss-esapi/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
//! are at most one level away from root.
5959
//!
6060
//! Minimum supported Rust version (MSRV):
61-
//! We currently check with version 1.53.0 of the Rust compiler during CI builds.
61+
//! We currently check with version 1.66.0 of the Rust compiler during CI builds.
6262
//!
6363
//! # Notes on code safety:
6464
//! * thread safety is ensured by the required mutability of the `Context` structure within the

tss-esapi/src/tcti_ldr.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -556,18 +556,13 @@ impl FromStr for TabrmdConfig {
556556
}
557557

558558
/// DBus type for usage with TABRMD
559-
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
559+
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
560560
pub enum BusType {
561+
#[default]
561562
System,
562563
Session,
563564
}
564565

565-
impl Default for BusType {
566-
fn default() -> Self {
567-
BusType::System
568-
}
569-
}
570-
571566
impl FromStr for BusType {
572567
type Err = Error;
573568

0 commit comments

Comments
 (0)