Skip to content

Commit fed7bc9

Browse files
committed
Merge remote-tracking branch 'upstream/main' into trustzone
2 parents dfa6d8e + f9c45c7 commit fed7bc9

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.github/workflows/rolling.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
msrv: ["1.85"] # We're relying on namespaced-features, which
41+
msrv: ["1.90"] # We're relying on namespaced-features, which
4242
# was released in 1.60
4343
#
4444
# We also depend on `fixed' which requires rust

src/espi.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,10 @@ impl<T: Instance> interrupt::typelevel::Handler<T::Interrupt> for InterruptHandl
9898
}
9999

100100
/// eSPI Port configuration.
101-
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
101+
#[derive(Default, Debug, PartialEq, Eq, Clone, Copy)]
102102
pub enum PortConfig {
103103
/// Unconfigured
104+
#[default]
104105
Unconfigured,
105106

106107
/// ACPI-style Endpoint
@@ -205,12 +206,6 @@ impl From<PortConfig> for Type {
205206
}
206207
}
207208

208-
impl Default for PortConfig {
209-
fn default() -> Self {
210-
Self::Unconfigured
211-
}
212-
}
213-
214209
/// eSPI capabilities.
215210
#[derive(Clone, Copy)]
216211
pub struct Capabilities {

0 commit comments

Comments
 (0)