Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI RUST_VERSION to 1.72.0 #575

Merged
merged 6 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ concurrency:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: 1.69.0
NIGHTLY_RUST_VERSION: nightly-2023-05-23
RUST_VERSION: 1.72.0
NIGHTLY_RUST_VERSION: nightly-2023-08-28

jobs:
check-changelog:
Expand Down
2 changes: 1 addition & 1 deletion ci_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# The script runs almost all CI checks locally.
#
# Requires installed:
# - Rust `1.69.0`
# - Rust `1.72.0`
# - Nightly rust formatter
# - `rustup target add thumbv6m-none-eabi`
# - `rustup target add wasm32-unknown-unknown`
Expand Down
4 changes: 2 additions & 2 deletions fuel-vm/src/interpreter/balances.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ impl TryFrom<InitialBalances> for RuntimeBalances {
.checked_add(*retryable_amount)
.ok_or(CheckError::ArithmeticOverflow)?;
}
Self::try_from_iter(balances.into_iter())
Self::try_from_iter(balances)
}
}

Expand Down Expand Up @@ -291,7 +291,7 @@ fn try_from_iter_wont_overflow() {

// Aggregated sum check
let balances = vec![(a, u64::MAX), (b, 15), (c, 0), (b, 1)];
let balances_aggregated = vec![(a, u64::MAX), (b, 16), (c, 0)];
let balances_aggregated = [(a, u64::MAX), (b, 16), (c, 0)];
let runtime_balances =
RuntimeBalances::try_from_iter(balances).expect("failed to create balance set");

Expand Down
4 changes: 2 additions & 2 deletions fuel-vm/src/interpreter/blockchain/code_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fn test_load_contract() -> Result<(), RuntimeError> {
.unwrap();

let mut panic_context = PanicContext::None;
let input_contracts = vec![contract_id];
let input_contracts = [contract_id];
let input = LoadContractCodeCtx {
contract_max_size: 100,
storage: &storage,
Expand Down Expand Up @@ -70,7 +70,7 @@ fn test_code_copy() -> Result<(), RuntimeError> {
.storage_contract_insert(&contract_id, &Contract::from(vec![5u8; 400]))
.unwrap();

let input_contracts = vec![contract_id];
let input_contracts = [contract_id];
let mut panic_context = PanicContext::None;
let input = CodeCopyCtx {
storage: &storage,
Expand Down
4 changes: 2 additions & 2 deletions fuel-vm/src/interpreter/blockchain/other_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ fn test_code_root() {
},
};
let mut pc = 4;
let input_contracts = vec![contract_id];
let input_contracts = [contract_id];
let mut panic_context = PanicContext::None;
CodeRootCtx {
memory: &mut memory,
Expand Down Expand Up @@ -312,7 +312,7 @@ fn test_code_size() {
let is = 0;
let mut cgas = 0;
let mut ggas = 0;
let input_contract = vec![contract_id];
let input_contract = [contract_id];
let mut panic_context = PanicContext::None;
let input = CodeSizeCtx {
storage: &mut storage,
Expand Down
5 changes: 2 additions & 3 deletions fuel-vm/src/interpreter/blockchain/smo_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,8 @@ fn test_smo(
initial_balance,
)
.unwrap();
let mut balances =
RuntimeBalances::try_from_iter([(asset, initial_balance)].into_iter())
.expect("Should be valid balance");
let mut balances = RuntimeBalances::try_from_iter([(asset, initial_balance)])
.expect("Should be valid balance");
let fp = 0;
let mut pc = 0;
let input = MessageOutputCtx {
Expand Down
8 changes: 4 additions & 4 deletions fuel-vm/src/tests/blockchain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ fn state_read_write() {

let program = function_selector
.into_iter()
.chain(call_arguments_parser.into_iter())
.chain(routine_add_word_to_state.into_iter())
.chain(routine_unpack_and_xor_limbs_into_state.into_iter())
.chain(invalid_call.into_iter())
.chain(call_arguments_parser)
.chain(routine_add_word_to_state)
.chain(routine_unpack_and_xor_limbs_into_state)
.chain(invalid_call)
.collect_vec();

let contract_id = test_context.setup_contract(program, None, None).contract_id;
Expand Down
2 changes: 1 addition & 1 deletion fuel-vm/src/tests/flow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ fn revert() {

let program = call_arguments_parser
.into_iter()
.chain(routine_add_word_to_state.into_iter())
.chain(routine_add_word_to_state)
.collect_vec();

let contract_id = test_context.setup_contract(program, None, None).contract_id;
Expand Down
2 changes: 1 addition & 1 deletion fuel-vm/src/tests/predicate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ async fn predicate() {
let wrong_data = wrong_data.to_be_bytes().to_vec();

// A script that will succeed only if the argument is 0x23
let predicate = vec![
let predicate = [
op::movi(0x10, 0x11),
op::addi(0x11, 0x10, 0x12),
op::movi(0x12, 0x08),
Expand Down
Loading