Skip to content

Commit 7f397ef

Browse files
authored
Bump rust to 1.90 (#1694)
## Description - Bumps stable rust `1.86.0` -> `1.90.0` - Also aligns with sway repo (essentially making local patches easier) - Minor code changes (cargo clippy) required by rust `1.90.0` toolchain Required for FuelLabs/fuel-core#3110 (comment) # Checklist - [x] All **changes** are **covered** by **tests** (or not applicable) - [x] All **changes** are **documented** (or not applicable) - [x] I **reviewed** the **entire PR** myself (preferably, on GH UI) - [x] I **described** all **Breaking Changes** (or there's none) --------- Co-authored-by: z <[email protected]>
1 parent 63e1fe7 commit 7f397ef

File tree

7 files changed

+58
-55
lines changed

7 files changed

+58
-55
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
FUEL_CORE_VERSION: 0.46.0
2020
FUEL_CORE_PATCH_BRANCH: ""
2121
FUEL_CORE_PATCH_REVISION: ""
22-
RUST_VERSION: 1.86.0
22+
RUST_VERSION: 1.90.0
2323
FORC_VERSION: 0.69.1
2424
FORC_PATCH_BRANCH: ""
2525
FORC_PATCH_REVISION: ""

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ homepage = "https://fuel.network/"
3838
readme = "README.md"
3939
license = "Apache-2.0"
4040
repository = "https://github.com/FuelLabs/fuels-rs"
41-
rust-version = "1.86.0"
41+
rust-version = "1.90.0"
4242
version = "0.75.1"
4343

4444
[workspace.dependencies]

examples/macros/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@ mod tests {
3434
use fuels::macros::{Parameterize, Tokenizable};
3535

3636
#[derive(Parameterize, Tokenizable)]
37+
#[allow(dead_code)]
3738
struct MyStruct {
3839
field_a: u8,
3940
}
4041

4142
#[derive(Parameterize, Tokenizable)]
43+
#[allow(dead_code)]
4244
enum SomeEnum {
4345
A(MyStruct),
4446
B(Vec<u64>),
@@ -58,6 +60,7 @@ mod tests {
5860
#[derive(Parameterize, Tokenizable)]
5961
#[FuelsCorePath = "fuels_core_elsewhere"]
6062
#[FuelsTypesPath = "fuels_types_elsewhere"]
63+
#[allow(dead_code)]
6164
pub struct SomeStruct {
6265
field_a: u64,
6366
}
@@ -68,6 +71,7 @@ mod tests {
6871
use fuels::macros::{Parameterize, Tokenizable};
6972
#[derive(Parameterize, Tokenizable)]
7073
#[NoStd]
74+
#[allow(dead_code)]
7175
pub struct SomeStruct {
7276
field_a: u64,
7377
}

packages/fuels-accounts/src/provider/cache.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -102,20 +102,20 @@ where
102102
async fn consensus_parameters(&self) -> Result<ConsensusParameters> {
103103
{
104104
let read_lock = self.cached_consensus_params.read().await;
105-
if let Some(entry) = read_lock.as_ref() {
106-
if !entry.is_stale(self.clock.now(), self.ttl_config.consensus_parameters) {
107-
return Ok(entry.value.clone());
108-
}
105+
if let Some(entry) = read_lock.as_ref()
106+
&& !entry.is_stale(self.clock.now(), self.ttl_config.consensus_parameters)
107+
{
108+
return Ok(entry.value.clone());
109109
}
110110
}
111111

112112
let mut write_lock = self.cached_consensus_params.write().await;
113113

114114
// because it could have been updated since we last checked
115-
if let Some(entry) = write_lock.as_ref() {
116-
if !entry.is_stale(self.clock.now(), self.ttl_config.consensus_parameters) {
117-
return Ok(entry.value.clone());
118-
}
115+
if let Some(entry) = write_lock.as_ref()
116+
&& !entry.is_stale(self.clock.now(), self.ttl_config.consensus_parameters)
117+
{
118+
return Ok(entry.value.clone());
119119
}
120120

121121
let fresh_parameters = self.client.consensus_parameters().await?;
@@ -132,20 +132,20 @@ where
132132
let ttl = self.ttl_config.consensus_parameters;
133133
{
134134
let read_lock = self.cached_node_info.read().await;
135-
if let Some(entry) = read_lock.as_ref() {
136-
if !entry.is_stale(self.clock.now(), ttl) {
137-
return Ok(entry.value.clone());
138-
}
135+
if let Some(entry) = read_lock.as_ref()
136+
&& !entry.is_stale(self.clock.now(), ttl)
137+
{
138+
return Ok(entry.value.clone());
139139
}
140140
}
141141

142142
let mut write_lock = self.cached_node_info.write().await;
143143

144144
// because it could have been updated since we last checked
145-
if let Some(entry) = write_lock.as_ref() {
146-
if !entry.is_stale(self.clock.now(), ttl) {
147-
return Ok(entry.value.clone());
148-
}
145+
if let Some(entry) = write_lock.as_ref()
146+
&& !entry.is_stale(self.clock.now(), ttl)
147+
{
148+
return Ok(entry.value.clone());
149149
}
150150

151151
let fresh_node_info = self.client.node_info().await?;

packages/fuels-core/src/types/token.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ impl StaticStringToken {
2424
return Err(error!(Codec, "string data can only have ascii values"));
2525
}
2626

27-
if let Some(expected_len) = self.expected_len {
28-
if self.data.len() != expected_len {
29-
return Err(error!(
30-
Codec,
31-
"string data has len {}, but the expected len is {}",
32-
self.data.len(),
33-
expected_len
34-
));
35-
}
27+
if let Some(expected_len) = self.expected_len
28+
&& self.data.len() != expected_len
29+
{
30+
return Err(error!(
31+
Codec,
32+
"string data has len {}, but the expected len is {}",
33+
self.data.len(),
34+
expected_len
35+
));
3636
}
3737

3838
Ok(())

packages/fuels-core/src/types/tx_status.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -118,33 +118,33 @@ impl TxStatus {
118118
revert_id: Option<u64>,
119119
log_decoder: Option<&LogDecoder>,
120120
) -> Error {
121-
if let (Some(revert_id), Some(log_decoder)) = (revert_id, log_decoder) {
122-
if let Some(error_detail) = log_decoder.get_error_codes(&revert_id) {
123-
let error_message = if error_detail.log_id.is_some() {
124-
log_decoder
125-
.decode_last_log(&receipts)
126-
.unwrap_or_else(|err| {
127-
format!("failed to decode log from require revert: {err}")
128-
})
129-
} else {
130-
error_detail.msg.clone().expect("is there")
131-
};
121+
if let (Some(revert_id), Some(log_decoder)) = (revert_id, log_decoder)
122+
&& let Some(error_detail) = log_decoder.get_error_codes(&revert_id)
123+
{
124+
let error_message = if error_detail.log_id.is_some() {
125+
log_decoder
126+
.decode_last_log(&receipts)
127+
.unwrap_or_else(|err| {
128+
format!("failed to decode log from require revert: {err}")
129+
})
130+
} else {
131+
error_detail.msg.clone().expect("is there")
132+
};
132133

133-
let reason = format!(
134-
"panicked at: `{}` - `{}:{}:{}` with message `{}`",
135-
error_detail.pkg,
136-
error_detail.file,
137-
error_detail.line,
138-
error_detail.column,
139-
error_message
140-
);
134+
let reason = format!(
135+
"panicked at: `{}` - `{}:{}:{}` with message `{}`",
136+
error_detail.pkg,
137+
error_detail.file,
138+
error_detail.line,
139+
error_detail.column,
140+
error_message
141+
);
141142

142-
return Error::Transaction(Reason::Failure {
143-
reason,
144-
revert_id: Some(revert_id),
145-
receipts,
146-
});
147-
}
143+
return Error::Transaction(Reason::Failure {
144+
reason,
145+
revert_id: Some(revert_id),
146+
receipts,
147+
});
148148
}
149149

150150
let reason = match (revert_id, log_decoder) {

packages/fuels-test-helpers/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,12 @@ pub fn setup_multiple_assets_coins(
6464

6565
/// Create a vector of UTXOs with the provided AssetIds, num_coins, and amount_per_coin
6666
pub fn setup_custom_assets_coins(owner: Address, assets: &[AssetConfig]) -> Vec<Coin> {
67-
let coins = assets
67+
assets
6868
.iter()
6969
.flat_map(|asset| {
7070
setup_single_asset_coins(owner, asset.id, asset.num_coins, asset.coin_amount)
7171
})
72-
.collect::<Vec<Coin>>();
73-
coins
72+
.collect::<Vec<Coin>>()
7473
}
7574

7675
/// Create a vector of `num_coins` UTXOs containing `amount_per_coin` amount of asset `asset_id`.

0 commit comments

Comments
 (0)