From 167260d9c8da3bb77eb84c8b89fd1870fb520a9d Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Sat, 9 Dec 2023 22:15:09 +0100 Subject: [PATCH 01/11] `-D warnings` for `cargo-check-each-crate` job --- .gitlab/pipeline/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/pipeline/test.yml b/.gitlab/pipeline/test.yml index f6dad887a68dd..0e7d96f3dbab7 100644 --- a/.gitlab/pipeline/test.yml +++ b/.gitlab/pipeline/test.yml @@ -438,6 +438,7 @@ cargo-check-each-crate: - .run-immediately # - .collect-artifacts variables: + RUSTFLAGS: "-D warnings" # $CI_JOB_NAME is set manually so that cache could be shared for all jobs # "cargo-check-each-crate I/N" jobs CI_JOB_NAME: cargo-check-each-crate From 4c455da84a648624120c7d805949770bcfb916c8 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Sat, 9 Dec 2023 22:27:23 +0100 Subject: [PATCH 02/11] Fix? --- substrate/primitives/api/proc-macro/src/utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/primitives/api/proc-macro/src/utils.rs b/substrate/primitives/api/proc-macro/src/utils.rs index 68f0a77a3995d..a5c128f9adee9 100644 --- a/substrate/primitives/api/proc-macro/src/utils.rs +++ b/substrate/primitives/api/proc-macro/src/utils.rs @@ -19,7 +19,7 @@ use crate::common::API_VERSION_ATTRIBUTE; use inflector::Inflector; use proc_macro2::{Span, TokenStream}; use proc_macro_crate::{crate_name, FoundCrate}; -use quote::{format_ident, quote, ToTokens}; +use quote::{format_ident, quote}; use syn::{ parse_quote, spanned::Spanned, token::And, Attribute, Error, FnArg, GenericArgument, Ident, ImplItem, ItemImpl, Pat, Path, PathArguments, Result, ReturnType, Signature, Type, TypePath, From 08473530f5e754cb7dfe8754bf82a44d9016b909 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Sat, 9 Dec 2023 22:32:28 +0100 Subject: [PATCH 03/11] Fix? --- substrate/primitives/api/proc-macro/src/utils.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/substrate/primitives/api/proc-macro/src/utils.rs b/substrate/primitives/api/proc-macro/src/utils.rs index a5c128f9adee9..c8c1f12d90a16 100644 --- a/substrate/primitives/api/proc-macro/src/utils.rs +++ b/substrate/primitives/api/proc-macro/src/utils.rs @@ -261,6 +261,7 @@ pub fn versioned_trait_name(trait_ident: &Ident, version: u64) -> Ident { /// Extract the documentation from the provided attributes. #[cfg(feature = "frame-metadata")] pub fn get_doc_literals(attrs: &[syn::Attribute]) -> Vec { + use quote::ToTokens; attrs .iter() .filter_map(|attr| { From d234ca33b3d437e456364aa38bd4d3d02b260a8e Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Sat, 9 Dec 2023 22:55:43 +0100 Subject: [PATCH 04/11] Fix? --- substrate/primitives/state-machine/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/substrate/primitives/state-machine/src/lib.rs b/substrate/primitives/state-machine/src/lib.rs index 1345097e8f633..5909a30a814c3 100644 --- a/substrate/primitives/state-machine/src/lib.rs +++ b/substrate/primitives/state-machine/src/lib.rs @@ -142,7 +142,6 @@ pub use crate::{ mod std_reexport { pub use crate::{ basic::BasicExternalities, - error::{Error, ExecutionError}, in_memory_backend::new_in_mem, read_only::{InspectState, ReadOnlyExternalities}, testing::TestExternalities, From ebc07559a6456218b2363082d39cf8ec47d6ad99 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Sat, 9 Dec 2023 23:39:16 +0100 Subject: [PATCH 05/11] Fix? --- substrate/client/transaction-pool/src/graph/mod.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/substrate/client/transaction-pool/src/graph/mod.rs b/substrate/client/transaction-pool/src/graph/mod.rs index 5afdddb7402d1..829e6ddc67cd6 100644 --- a/substrate/client/transaction-pool/src/graph/mod.rs +++ b/substrate/client/transaction-pool/src/graph/mod.rs @@ -40,8 +40,7 @@ pub mod watcher; pub use self::{ base_pool::Transaction, pool::{ - BlockHash, ChainApi, EventStream, ExtrinsicFor, ExtrinsicHash, NumberFor, Options, Pool, - TransactionFor, + BlockHash, ChainApi, ExtrinsicFor, ExtrinsicHash, NumberFor, Options, Pool, }, }; pub use validated_pool::{IsValidator, ValidatedTransaction}; From 8a311ae2f09b778e931ca8ab8829889b11b07b46 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Sun, 10 Dec 2023 00:13:49 +0100 Subject: [PATCH 06/11] More imports? --- substrate/client/network/src/behaviour.rs | 2 +- substrate/client/network/src/protocol/message.rs | 4 ---- .../client/network/src/protocol/notifications/upgrade.rs | 6 +++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/substrate/client/network/src/behaviour.rs b/substrate/client/network/src/behaviour.rs index 9f770bc3ba745..745550412fc21 100644 --- a/substrate/client/network/src/behaviour.rs +++ b/substrate/client/network/src/behaviour.rs @@ -39,7 +39,7 @@ use parking_lot::Mutex; use sp_runtime::traits::Block as BlockT; use std::{collections::HashSet, sync::Arc, time::Duration}; -pub use crate::request_responses::{InboundFailure, OutboundFailure, RequestId, ResponseFailure}; +pub use crate::request_responses::{InboundFailure, OutboundFailure, ResponseFailure}; /// General behaviour of the network. Combines all protocols together. #[derive(NetworkBehaviour)] diff --git a/substrate/client/network/src/protocol/message.rs b/substrate/client/network/src/protocol/message.rs index 247580083f99e..5f2511fd6ddc9 100644 --- a/substrate/client/network/src/protocol/message.rs +++ b/substrate/client/network/src/protocol/message.rs @@ -19,10 +19,6 @@ //! Network packet message types. These get serialized and put into the lower level protocol //! payload. -pub use self::generic::{ - RemoteCallRequest, RemoteChangesRequest, RemoteChangesResponse, RemoteHeaderRequest, - RemoteHeaderResponse, RemoteReadChildRequest, RemoteReadRequest, -}; use codec::{Decode, Encode}; use sc_client_api::StorageProof; use sc_network_common::message::RequestId; diff --git a/substrate/client/network/src/protocol/notifications/upgrade.rs b/substrate/client/network/src/protocol/notifications/upgrade.rs index 70c6023623f51..162a485bae2e3 100644 --- a/substrate/client/network/src/protocol/notifications/upgrade.rs +++ b/substrate/client/network/src/protocol/notifications/upgrade.rs @@ -19,9 +19,9 @@ pub use self::{ collec::UpgradeCollec, notifications::{ - NotificationsHandshakeError, NotificationsIn, NotificationsInOpen, - NotificationsInSubstream, NotificationsInSubstreamHandshake, NotificationsOut, - NotificationsOutError, NotificationsOutOpen, NotificationsOutSubstream, + NotificationsIn, + NotificationsInSubstream, NotificationsOut, + NotificationsOutSubstream, }, }; From dc3e7763c8e6595b1f019bfbcc724a09bd99c064 Mon Sep 17 00:00:00 2001 From: command-bot <> Date: Sat, 9 Dec 2023 23:18:10 +0000 Subject: [PATCH 07/11] ".git/.scripts/commands/fmt/fmt.sh" --- .../client/network/src/protocol/notifications/upgrade.rs | 4 +--- substrate/client/transaction-pool/src/graph/mod.rs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/substrate/client/network/src/protocol/notifications/upgrade.rs b/substrate/client/network/src/protocol/notifications/upgrade.rs index 162a485bae2e3..34f2bf8023ad1 100644 --- a/substrate/client/network/src/protocol/notifications/upgrade.rs +++ b/substrate/client/network/src/protocol/notifications/upgrade.rs @@ -19,9 +19,7 @@ pub use self::{ collec::UpgradeCollec, notifications::{ - NotificationsIn, - NotificationsInSubstream, NotificationsOut, - NotificationsOutSubstream, + NotificationsIn, NotificationsInSubstream, NotificationsOut, NotificationsOutSubstream, }, }; diff --git a/substrate/client/transaction-pool/src/graph/mod.rs b/substrate/client/transaction-pool/src/graph/mod.rs index 829e6ddc67cd6..484a6d6cf9f07 100644 --- a/substrate/client/transaction-pool/src/graph/mod.rs +++ b/substrate/client/transaction-pool/src/graph/mod.rs @@ -39,8 +39,6 @@ pub mod watcher; pub use self::{ base_pool::Transaction, - pool::{ - BlockHash, ChainApi, ExtrinsicFor, ExtrinsicHash, NumberFor, Options, Pool, - }, + pool::{BlockHash, ChainApi, ExtrinsicFor, ExtrinsicHash, NumberFor, Options, Pool}, }; pub use validated_pool::{IsValidator, ValidatedTransaction}; From cd6ef00032ed87e637074260557c95c2e000fb7c Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Sun, 10 Dec 2023 00:37:22 +0100 Subject: [PATCH 08/11] Fix? --- .../client/network/src/protocol/notifications/upgrade.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/substrate/client/network/src/protocol/notifications/upgrade.rs b/substrate/client/network/src/protocol/notifications/upgrade.rs index 34f2bf8023ad1..563a6f5dff2a4 100644 --- a/substrate/client/network/src/protocol/notifications/upgrade.rs +++ b/substrate/client/network/src/protocol/notifications/upgrade.rs @@ -22,6 +22,10 @@ pub use self::{ NotificationsIn, NotificationsInSubstream, NotificationsOut, NotificationsOutSubstream, }, }; +#[cfg(test)] +pub(crate) use self::{ + notifications::{NotificationsInOpen, NotificationsInSubstreamHandshake, NotificationsOutOpen} +}; mod collec; mod notifications; From 3f0d7c8ab5daf3657fc23cf07265b7300639b603 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Mon, 11 Dec 2023 10:08:39 +0100 Subject: [PATCH 09/11] more unused --- substrate/client/offchain/src/api.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/substrate/client/offchain/src/api.rs b/substrate/client/offchain/src/api.rs index 40f866b6d2858..65e2f3ba64dbe 100644 --- a/substrate/client/offchain/src/api.rs +++ b/substrate/client/offchain/src/api.rs @@ -30,7 +30,6 @@ use sp_core::{ }, OpaquePeerId, }; -pub use sp_offchain::STORAGE_PREFIX; mod http; From d63c2e1804e315464dbd64d6e6fdc53398b8c630 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Mon, 11 Dec 2023 10:43:51 +0100 Subject: [PATCH 10/11] Fix: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/4679328 --- substrate/frame/contracts/proc-macro/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/frame/contracts/proc-macro/src/lib.rs b/substrate/frame/contracts/proc-macro/src/lib.rs index 4ef02497b8ee2..9dc34d5223b27 100644 --- a/substrate/frame/contracts/proc-macro/src/lib.rs +++ b/substrate/frame/contracts/proc-macro/src/lib.rs @@ -74,7 +74,7 @@ fn derive_debug(input: TokenStream, fmt: impl Fn(&Ident) -> TokenStream2) -> Tok #[cfg(not(feature = "full"))] let fields = { drop(fmt); - drop(data); + let _ = data; TokenStream2::new() }; From 123a34ffc81873d403310ba068ea546bd3fce3ca Mon Sep 17 00:00:00 2001 From: command-bot <> Date: Mon, 11 Dec 2023 10:19:14 +0000 Subject: [PATCH 11/11] ".git/.scripts/commands/fmt/fmt.sh" --- .../client/network/src/protocol/notifications/upgrade.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/substrate/client/network/src/protocol/notifications/upgrade.rs b/substrate/client/network/src/protocol/notifications/upgrade.rs index 563a6f5dff2a4..8fd837f949d8a 100644 --- a/substrate/client/network/src/protocol/notifications/upgrade.rs +++ b/substrate/client/network/src/protocol/notifications/upgrade.rs @@ -16,16 +16,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#[cfg(test)] +pub(crate) use self::notifications::{ + NotificationsInOpen, NotificationsInSubstreamHandshake, NotificationsOutOpen, +}; pub use self::{ collec::UpgradeCollec, notifications::{ NotificationsIn, NotificationsInSubstream, NotificationsOut, NotificationsOutSubstream, }, }; -#[cfg(test)] -pub(crate) use self::{ - notifications::{NotificationsInOpen, NotificationsInSubstreamHandshake, NotificationsOutOpen} -}; mod collec; mod notifications;