Skip to content

Commit

Permalink
Update rust version to 1.74
Browse files Browse the repository at this point in the history
  • Loading branch information
nick-mobilecoin committed Oct 19, 2023
1 parent a1eba59 commit 8235dfa
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 13 deletions.
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,10 @@ exclude = [
"util/serial",
]

resolver = "2"

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

[profile.dev]
opt-level = 0
Expand Down
12 changes: 12 additions & 0 deletions admin-http-gateway/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@
#![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
2 changes: 2 additions & 0 deletions common/src/hasher_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ pub struct HasherBuilder {

impl Default for HasherBuilder {
fn default() -> Self {
// in wasm McRng is a type alias so one cannot assign it as a default value.
#[allow(clippy::default_constructed_unit_structs)]
let mut rng = McRng::default();
let k0 = rng.next_u64();
let k1 = rng.next_u64();
Expand Down
4 changes: 2 additions & 2 deletions consensus/enclave/trusted/Cargo.lock

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

1 change: 1 addition & 0 deletions crypto/digestible/test-utils/src/inspect_ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ impl ASTNode {
// This is only test code that doesn't get shipped.
#[inline(never)]
#[allow(clippy::transmute_ptr_to_ptr)]
#[allow(invalid_reference_casting)]
pub fn find_incomplete_child_mut(&mut self) -> Option<&mut ASTNode> {
self.find_incomplete_child().map(|x| {
// Safety:
Expand Down
6 changes: 1 addition & 5 deletions crypto/hashes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,4 @@ mc-crypto-digestible = { path = "../digestible", default_features = false }

digest = { version = "0.10.1", default-features = false }

[target.'cfg(any(target_feature = "avx2", target_feature = "avx"))'.dependencies]
blake2 = { version = "0.10.2", default-features = false, features = ["simd"] }

[target.'cfg(not(any(target_feature = "avx2", target_feature = "avx")))'.dependencies]
blake2 = { version = "0.10.2", default-features = false }
blake2 = { version = "0.10.6", default-features = false }
2 changes: 1 addition & 1 deletion docker/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly-2023-01-22"
channel = "nightly-2023-10-01"
4 changes: 0 additions & 4 deletions fog/ocall_oram_storage/trusted/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ lazy_static = { version = "1.4", features = ["spin_no_std"] }
rand_core = { version = "0.6", default-features = false }
subtle = { version = "2", default-features = false }

[target.'cfg(any(target_feature = "avx2", target_feature = "avx"))'.dependencies]
blake2 = { version = "0.10.6", default-features = false, features = ["simd"] }

[target.'cfg(not(any(target_feature = "avx2", target_feature = "avx")))'.dependencies]
blake2 = { version = "0.10.6", default-features = false }

[dev-dependencies]
Expand Down
1 change: 1 addition & 0 deletions sgx/panic/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
//
// Alloc feature must be enabled to get APIs associated to catching panics
// and rethrowing them, because in Rust those APIs use the Box type.
#![allow(internal_features)]
#![feature(lang_items)] // for eh_personality
#![feature(thread_local)]

Expand Down

0 comments on commit 8235dfa

Please sign in to comment.