Merge pull request #254 from CosmWasm/update-to-rust-1.51.0

Update to Rust v1.51.0
CosmWasm · Mar 30, 2021 · 62ac2b7 · 62ac2b7
2 parents ce82ab2 + f017d57
commit 62ac2b7
Show file tree

Hide file tree

Showing 16 changed files with 114 additions and 121 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/contracts/cw1-subkeys/src/contract.rs b/contracts/cw1-subkeys/src/contract.rs
@@ -87,9 +87,11 @@ where
     let owner_raw = &deps.api.canonical_address(&info.sender)?;
     // this is the admin behavior (same as cw1-whitelist)
     if cfg.is_admin(owner_raw) {
-        let mut res = Response::default();
-        res.messages = msgs;
-        res.attributes = vec![attr("action", "execute"), attr("owner", info.sender)];
+        let res = Response {
+            messages: msgs,
+            attributes: vec![attr("action", "execute"), attr("owner", info.sender)],
+            ..Response::default()
+        };
         Ok(res)
     } else {
         for msg in &msgs {

diff --git a/contracts/cw1-whitelist/src/contract.rs b/contracts/cw1-whitelist/src/contract.rs
@@ -74,9 +74,11 @@ where
     if !can_execute(deps.as_ref(), &info.sender)? {
         Err(ContractError::Unauthorized {})
     } else {
-        let mut res = Response::default();
-        res.messages = msgs;
-        res.attributes = vec![attr("action", "execute")];
+        let res = Response {
+            messages: msgs,
+            attributes: vec![attr("action", "execute")],
+            ..Response::default()
+        };
         Ok(res)
     }
 }
@@ -93,8 +95,10 @@ pub fn execute_freeze(
         cfg.mutable = false;
         ADMIN_LIST.save(deps.storage, &cfg)?;
 
-        let mut res = Response::default();
-        res.attributes = vec![attr("action", "freeze")];
+        let res = Response {
+            attributes: vec![attr("action", "freeze")],
+            ..Response::default()
+        };
         Ok(res)
     }
 }
@@ -112,8 +116,10 @@ pub fn execute_update_admins(
         cfg.admins = map_canonical(deps.api, &admins)?;
         ADMIN_LIST.save(deps.storage, &cfg)?;
 
-        let mut res = Response::default();
-        res.attributes = vec![attr("action", "update_admins")];
+        let res = Response {
+            attributes: vec![attr("action", "update_admins")],
+            ..Response::default()
+        };
         Ok(res)
     }
 }

diff --git a/contracts/cw20-atomic-swap/src/contract.rs b/contracts/cw20-atomic-swap/src/contract.rs
@@ -116,13 +116,15 @@ pub fn execute_create(
         Some(_) => Err(ContractError::AlreadyExists {}),
     })?;
 
-    let mut res = Response::default();
-    res.attributes = vec![
-        attr("action", "create"),
-        attr("id", msg.id),
-        attr("hash", msg.hash),
-        attr("recipient", msg.recipient),
-    ];
+    let res = Response {
+        attributes: vec![
+            attr("action", "create"),
+            attr("id", msg.id),
+            attr("hash", msg.hash),
+            attr("recipient", msg.recipient),
+        ],
+        ..Response::default()
+    };
     Ok(res)
 }
 

diff --git a/contracts/cw20-escrow/src/contract.rs b/contracts/cw20-escrow/src/contract.rs
@@ -112,8 +112,10 @@ pub fn execute_create(
         Some(_) => Err(ContractError::AlreadyInUse {}),
     })?;
 
-    let mut res = Response::default();
-    res.attributes = vec![attr("action", "create"), attr("id", msg.id)];
+    let res = Response {
+        attributes: vec![attr("action", "create"), attr("id", msg.id)],
+        ..Response::default()
+    };
     Ok(res)
 }
 
@@ -140,8 +142,10 @@ pub fn execute_top_up(
     // and save
     ESCROWS.save(deps.storage, &id, &escrow)?;
 
-    let mut res = Response::default();
-    res.attributes = vec![attr("action", "top_up"), attr("id", id)];
+    let res = Response {
+        attributes: vec![attr("action", "top_up"), attr("id", id)],
+        ..Response::default()
+    };
     Ok(res)
 }
 

diff --git a/contracts/cw20-ics20/src/ibc.rs b/contracts/cw20-ics20/src/ibc.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

diff --git a/contracts/cw20-ics20/src/msg.rs b/contracts/cw20-ics20/src/msg.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

diff --git a/contracts/cw20-ics20/src/state.rs b/contracts/cw20-ics20/src/state.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

diff --git a/packages/cw0/src/balance.rs b/packages/cw0/src/balance.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::ops;

diff --git a/packages/cw0/src/expiration.rs b/packages/cw0/src/expiration.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

diff --git a/packages/cw2/src/lib.rs b/packages/cw2/src/lib.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

diff --git a/packages/cw20/src/helpers.rs b/packages/cw20/src/helpers.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

diff --git a/packages/cw20/src/msg.rs b/packages/cw20/src/msg.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

diff --git a/packages/cw20/src/query.rs b/packages/cw20/src/query.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

diff --git a/packages/cw20/src/receiver.rs b/packages/cw20/src/receiver.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::field_reassign_with_default)] // see https://github.com/CosmWasm/cosmwasm/issues/685
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

diff --git a/packages/storage-plus/src/keys.rs b/packages/storage-plus/src/keys.rs
@@ -249,9 +249,9 @@ impl<T: Endian> From<Vec<u8>> for IntKey<T> {
     }
 }
 
-impl<T: Endian> Into<Vec<u8>> for IntKey<T> {
-    fn into(self) -> Vec<u8> {
-        self.wrapped.0
+impl<T: Endian> From<IntKey<T>> for Vec<u8> {
+    fn from(k: IntKey<T>) -> Vec<u8> {
+        k.wrapped.0
     }
 }