Skip to content

Commit

Permalink
Merge pull request #9 from dscvr-one/bac-1544
Browse files Browse the repository at this point in the history
update rust to 1.79; fix warnings
  • Loading branch information
jeffgrunewald authored Jul 24, 2024
2 parents 5fc3d92 + a1469d4 commit 94e71c1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions crates/dscvr-canister-config/src/schema/dfx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ impl DfxConfig {

fn update_names(&mut self) {
for (k, val) in self.canisters.iter_mut() {
val.name = k.clone();
val.name.clone_from(k);
}
for (k, val) in self.networks.iter_mut() {
val.name = k.clone();
val.name.clone_from(k);
}
}

Expand Down
4 changes: 2 additions & 2 deletions crates/dscvr-canister-config/src/schema/dscvr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ impl DSCVRConfig {
.and_then(|canister_network| canister_network.provisioned_instances.clone());
for (name, network) in canister.networks.iter_mut() {
if copy_to_all || network_name.as_ref().unwrap() == name {
network.available_instances = available.clone();
network.provisioned_instances = provisioned.clone();
network.available_instances.clone_from(&available);
network.provisioned_instances.clone_from(&provisioned);
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions crates/ic-canister-logger/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use tracing_subscriber::fmt::time::FormatTime;

pub mod scoped_instruction_counter;

#[allow(dead_code)]
struct IcStdout;

impl Write for IcStdout {
Expand All @@ -27,8 +28,10 @@ impl Write for IcStdout {
}
}

#[allow(dead_code)]
struct IcTimer;

#[allow(dead_code)]
#[cfg(not(target_arch = "wasm32"))]
fn current_time_nanos() -> u64 {
time::OffsetDateTime::now_utc().unix_timestamp_nanos() as u64
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.77.2"
channel = "1.79.0"
components = ["rustfmt", "clippy"]
targets = ["wasm32-unknown-unknown"]

0 comments on commit 94e71c1

Please sign in to comment.