Skip to content

Commit c838886

Browse files
authored
Merge pull request #622 from ergoplatform/clippy_rustc_1_63
Fix clippy warnings for rustc 1.63 and update CI
2 parents df427ec + 1a38a7f commit c838886

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+71
-71
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- synchronize
1212

1313
env:
14-
RUSTV: '1.62'
14+
RUSTV: '1.63'
1515

1616
jobs:
1717
build_wo_default_features:

bindings/ergo-lib-c-core/src/context_extension.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{
55
use ergo_lib::ergotree_interpreter::sigma_protocol::prover;
66

77
/// User-defined variables to be put into context
8-
#[derive(PartialEq, Debug, Clone)]
8+
#[derive(PartialEq, Eq, Debug, Clone)]
99
pub struct ContextExtension(pub prover::ContextExtension);
1010
pub type ContextExtensionPtr = *mut ContextExtension;
1111
pub type ConstContextExtensionPtr = *const ContextExtension;

bindings/ergo-lib-c-core/src/data_input.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{
99
};
1010

1111
/// Inputs, that are used to enrich script context, but won't be spent by the transaction
12-
#[derive(PartialEq, Debug, Clone)]
12+
#[derive(PartialEq, Eq, Debug, Clone)]
1313
pub struct DataInput(pub chain::transaction::DataInput);
1414
pub type DataInputPtr = *mut DataInput;
1515
pub type ConstDataInputPtr = *const DataInput;

bindings/ergo-lib-c-core/src/input.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::{
1010
};
1111

1212
/// Unsigned inputs used in constructing unsigned transactions
13-
#[derive(PartialEq, Debug, Clone)]
13+
#[derive(PartialEq, Eq, Debug, Clone)]
1414
pub struct UnsignedInput(pub chain::transaction::UnsignedInput);
1515
pub type UnsignedInputPtr = *mut UnsignedInput;
1616
pub type ConstUnsignedInputPtr = *const UnsignedInput;
@@ -40,7 +40,7 @@ pub unsafe fn unsigned_input_context_extension(
4040
}
4141

4242
/// Signed inputs used in signed transactions
43-
#[derive(PartialEq, Debug, Clone)]
43+
#[derive(PartialEq, Eq, Debug, Clone)]
4444
pub struct Input(pub(crate) chain::transaction::Input);
4545
pub type InputPtr = *mut Input;
4646
pub type ConstInputPtr = *const Input;
@@ -70,7 +70,7 @@ pub unsafe fn input_spending_proof(
7070
}
7171

7272
/// Proof of correctness of tx spending
73-
#[derive(PartialEq, Debug, Clone)]
73+
#[derive(PartialEq, Eq, Debug, Clone)]
7474
pub struct ProverResult(chain::transaction::input::prover_result::ProverResult);
7575
pub type ProverResultPtr = *mut ProverResult;
7676
pub type ConstProverResultPtr = *const ProverResult;

bindings/ergo-lib-c-core/src/reduced.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub unsafe fn propositions_add_proposition_from_bytes(
5151
/// in an environment where secrets are known.
5252
/// see EIP-19 for more details -
5353
/// <https://github.com/ergoplatform/eips/blob/f280890a4163f2f2e988a0091c078e36912fc531/eip-0019.md>
54-
#[derive(PartialEq, Debug, Clone)]
54+
#[derive(PartialEq, Eq, Debug, Clone)]
5555
pub struct ReducedTransaction(pub(crate) ergo_lib::chain::transaction::reduced::ReducedTransaction);
5656
pub type ReducedTransactionPtr = *mut ReducedTransaction;
5757
pub type ConstReducedTransactionPtr = *const ReducedTransaction;

bindings/ergo-lib-c-core/src/secret_key.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::util::{const_ptr_as_ref, mut_ptr_as_mut};
88
use crate::Error;
99

1010
/// Secret key for the prover
11-
#[derive(PartialEq, Debug, Clone)]
11+
#[derive(PartialEq, Eq, Debug, Clone)]
1212
pub struct SecretKey(pub(crate) wallet::secret_key::SecretKey);
1313
pub type SecretKeyPtr = *mut SecretKey;
1414
pub type ConstSecretKeyPtr = *const SecretKey;

bindings/ergo-lib-c-core/src/transaction.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ pub unsafe fn transaction_extract_hints(
165165
}
166166

167167
/// Unsigned (inputs without proofs) transaction
168-
#[derive(PartialEq, Debug, Clone)]
168+
#[derive(PartialEq, Eq, Debug, Clone)]
169169
pub struct UnsignedTransaction(pub(crate) chain::transaction::unsigned::UnsignedTransaction);
170170
pub type UnsignedTransactionPtr = *mut UnsignedTransaction;
171171
pub type ConstUnsignedTransactionPtr = *const UnsignedTransaction;

bindings/ergo-lib-wasm/src/context_extension.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use derive_more::{From, Into};
99

1010
/// User-defined variables to be put into context
1111
#[wasm_bindgen]
12-
#[derive(PartialEq, Debug, Clone, From, Into)]
12+
#[derive(PartialEq, Eq, Debug, Clone, From, Into)]
1313
pub struct ContextExtension(
1414
ergo_lib::ergotree_interpreter::sigma_protocol::prover::ContextExtension,
1515
);

bindings/ergo-lib-wasm/src/input.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use derive_more::{From, Into};
1111

1212
/// Unsigned inputs used in constructing unsigned transactions
1313
#[wasm_bindgen]
14-
#[derive(PartialEq, Debug, Clone, From, Into)]
14+
#[derive(PartialEq, Eq, Debug, Clone, From, Into)]
1515
pub struct UnsignedInput(chain::transaction::UnsignedInput);
1616

1717
#[wasm_bindgen]
@@ -47,7 +47,7 @@ impl UnsignedInput {
4747

4848
/// Collection of unsigned signed inputs
4949
#[wasm_bindgen]
50-
#[derive(PartialEq, Debug, Clone)]
50+
#[derive(PartialEq, Eq, Debug, Clone)]
5151
pub struct UnsignedInputs(Vec<UnsignedInput>);
5252

5353
#[wasm_bindgen]
@@ -87,7 +87,7 @@ impl From<Vec<chain::transaction::UnsignedInput>> for UnsignedInputs {
8787

8888
/// Signed inputs used in signed transactions
8989
#[wasm_bindgen]
90-
#[derive(PartialEq, Debug, Clone, From, Into)]
90+
#[derive(PartialEq, Eq, Debug, Clone, From, Into)]
9191
pub struct Input(chain::transaction::Input);
9292

9393
#[wasm_bindgen]
@@ -105,7 +105,7 @@ impl Input {
105105

106106
/// Collection of signed inputs
107107
#[wasm_bindgen]
108-
#[derive(PartialEq, Debug, Clone)]
108+
#[derive(PartialEq, Eq, Debug, Clone)]
109109
pub struct Inputs(Vec<Input>);
110110

111111
#[wasm_bindgen]

bindings/ergo-lib-wasm/src/prover_result.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use derive_more::{From, Into};
88

99
/// Proof of correctness of tx spending
1010
#[wasm_bindgen]
11-
#[derive(PartialEq, Debug, Clone, From, Into)]
11+
#[derive(PartialEq, Eq, Debug, Clone, From, Into)]
1212
pub struct ProverResult(ergo_lib::chain::transaction::input::prover_result::ProverResult);
1313

1414
#[wasm_bindgen]

0 commit comments

Comments
 (0)