Skip to content

Commit 0b8f1d5

Browse files
committed
feat: bump rust version to 1.86
fixes the hardcoded `/usr/bin/strip` issue on macos see rust-lang/rust#131206 Signed-off-by: Harald Hoyer <[email protected]>
1 parent eb39705 commit 0b8f1d5

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

bin/verify-era-proof-attestation/src/proof/types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ impl Proof {
6161
pub fn is_permanently_ignored(&self) -> bool {
6262
self.status
6363
.as_ref()
64-
.map_or(false, |s| s.eq_ignore_ascii_case("permanently_ignored"))
64+
.is_some_and(|s| s.eq_ignore_ascii_case("permanently_ignored"))
6565
}
6666

6767
/// Check if the proof is failed or picked by a prover
6868
pub fn is_failed_or_picked(&self) -> bool {
69-
self.status.as_ref().map_or(false, |s| {
69+
self.status.as_ref().is_some_and(|s| {
7070
s.eq_ignore_ascii_case("failed") || s.eq_ignore_ascii_case("picked_by_prover")
7171
})
7272
}

crates/teepot-vault/src/client/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ impl TeeConnection {
222222
if self
223223
.args
224224
.sgx_allowed_tcb_levels
225-
.map_or(true, |levels| !levels.contains(tcblevel))
225+
.is_none_or(|levels| !levels.contains(tcblevel))
226226
{
227227
error!("Quote verification result: {}", tcblevel);
228228
return Err(Error::General(format!(

crates/teepot-vault/src/client/vault.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ impl VaultConnection {
297297
}
298298

299299
/// set a secret in the vault
300-
pub async fn store_secret<'de, T: serde::Serialize>(
300+
pub async fn store_secret<T: serde::Serialize>(
301301
&self,
302302
val: T,
303303
rel_path: &str,
@@ -306,7 +306,7 @@ impl VaultConnection {
306306
}
307307

308308
/// set a secret in the vault for a different TEE
309-
pub async fn store_secret_for_tee<'de, T: serde::Serialize>(
309+
pub async fn store_secret_for_tee<T: serde::Serialize>(
310310
&self,
311311
tee_name: &str,
312312
val: T,
@@ -330,15 +330,15 @@ impl VaultConnection {
330330
}
331331

332332
/// get a secret from the vault
333-
pub async fn load_secret<'de, T: serde::de::DeserializeOwned>(
333+
pub async fn load_secret<T: serde::de::DeserializeOwned>(
334334
&self,
335335
rel_path: &str,
336336
) -> Result<Option<T>, HttpResponseError> {
337337
self.load_secret_for_tee(&self.name, rel_path).await
338338
}
339339

340340
/// get a secret from the vault for a specific TEE
341-
pub async fn load_secret_for_tee<'de, T: serde::de::DeserializeOwned>(
341+
pub async fn load_secret_for_tee<T: serde::de::DeserializeOwned>(
342342
&self,
343343
tee_name: &str,
344344
rel_path: &str,

crates/teepot/src/quote/attestation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ pub fn get_quote_and_collateral(
8181
}
8282

8383
if tcblevel != TcbLevel::Ok
84-
&& allowed_tcb_levels.map_or(false, |levels| !levels.contains(tcblevel))
84+
&& allowed_tcb_levels.is_some_and(|levels| !levels.contains(tcblevel))
8585
{
8686
error!("Quote verification result: {}", tcblevel);
8787
bail!("Quote verification result: {}", tcblevel);

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.83"
2+
channel = "1.86"
33
components = ["rustfmt", "clippy", "rust-src"]

0 commit comments

Comments
 (0)