Skip to content

Commit

Permalink
Upgrade Rust to 1.76.0-nightly (#4021)
Browse files Browse the repository at this point in the history
* upgrade rust to 1.76.0 nightly - 2023-12-21
  • Loading branch information
jgreat authored Dec 12, 2024
1 parent ca96834 commit 69e4cb4
Show file tree
Hide file tree
Showing 37 changed files with 118 additions and 117 deletions.
2 changes: 2 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ fail-fast = false
failure-output = "immediate-final"
# Show failed, flaky and retried, and slow tests.
status-level = "slow"
# Add retires for flaky tests
retries = { backoff = "exponential", count = 3, delay = "5s" }

[profile.ci.junit]
# Output a JUnit report under `target/nextest/ci/junit.xml`.
Expand Down
119 changes: 58 additions & 61 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ exclude = [
resolver = "2"

[workspace.package]
rust-version = "1.74.0"
rust-version = "1.76.0"

[profile.dev]
opt-level = 0
Expand Down
2 changes: 1 addition & 1 deletion admin-http-gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mc-util-uri = { path = "../util/uri" }

clap = { version = "4.5", features = ["derive", "env"] }
grpcio = "0.13"
rocket = { version = "0.5.0", features = ["json"] }
rocket = { version = "0.5.1", features = ["json"] }
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
Expand Down
12 changes: 0 additions & 12 deletions admin-http-gateway/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,6 @@
#![deny(missing_docs)]
#![feature(proc_macro_hygiene, decl_macro)]
// Needed due to the `FromForm` macro implementation in rocket
// Without it one gets:
// --> admin-http-gateway/src/main.rs:93:1
// |
// 93 | / struct SetRustLogForm {
// 94 | | rust_log: String,
// 95 | | }
// | |_^
// |
// = note: `-D renamed-and-removed-lints` implied by `-D warnings`
// = help: to override `-D warnings` add `#[allow(renamed_and_removed_lints)]`
#![allow(renamed_and_removed_lints)]

use clap::Parser;
use grpcio::ChannelBuilder;
Expand Down
4 changes: 4 additions & 0 deletions attest/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
#![no_std]
#![feature(core_intrinsics)]
#![allow(clippy::result_large_err)]
// This is needed to use feature(core_intrinsics)
// I believe were using the core_intrinsics feature for f64 abs support since we are in no_std.
// This is IAS code so its almost dead.
#![allow(internal_features)]

extern crate alloc;
#[macro_use]
Expand Down
4 changes: 2 additions & 2 deletions consensus/enclave/impl/src/constant_time_token_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ impl<T: ConditionallySelectable + Default> CtTokenMap<T> {
}

/// Iterate over all entries in the map.
pub fn iter(&self) -> impl Iterator<Item = &(TokenId, T)> + DoubleEndedIterator {
pub fn iter(&self) -> impl DoubleEndedIterator<Item = &(TokenId, T)> {
self.storage.iter()
}

/// Get an iterator over the keys of this map.
pub fn keys(&self) -> impl Iterator<Item = &TokenId> + DoubleEndedIterator {
pub fn keys(&self) -> impl DoubleEndedIterator<Item = &TokenId> {
self.storage.iter().map(|(key, _val)| key)
}
}
Expand Down
Loading

0 comments on commit 69e4cb4

Please sign in to comment.