ci: use rust 1.75 in CI (#5435)

## Description Bumps CI rust version to 1.75 and fixes new warnings popped up during the process. unblocks #5433
FuelLabs · Jan 4, 2024 · bb1a627 · bb1a627
1 parent bae4be8
commit bb1a627
Show file tree

Hide file tree

Showing 24 changed files with 252 additions and 256 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,8 +15,8 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   REGISTRY: ghcr.io
-  RUST_VERSION: 1.73.0
-  NIGHTLY_RUST_VERSION: nightly-2023-08-27
+  RUST_VERSION: 1.75.0
+  NIGHTLY_RUST_VERSION: nightly-2023-12-27
 
 jobs:
   build-sway-lib-core:

diff --git a/forc/src/cli/plugin.rs b/forc/src/cli/plugin.rs
@@ -19,7 +19,7 @@ pub(crate) fn execute_external_subcommand(
     args: Vec<String>,
     silent: bool,
 ) -> Result<process::Output> {
-    let cmd = args.get(0).expect("`args` must not be empty");
+    let cmd = args.first().expect("`args` must not be empty");
     let args = &args[1..];
     let path = find_external_subcommand(cmd);
     let command = match path {

diff --git a/sway-ast/src/priv_prelude.rs b/sway-ast/src/priv_prelude.rs
@@ -1,15 +1,14 @@
 pub use {
     crate::{
         assignable::Assignable,
-        attribute::{Annotated, Attribute, AttributeDecl},
+        attribute::Annotated,
         brackets::{AngleBrackets, Braces, Parens, SquareBrackets},
         expr::{
             asm::{AsmBlock, AsmImmediate},
             op_code::Instruction,
             CodeBlockContents, Expr,
         },
         generics::{GenericArgs, GenericParams},
-        intrinsics::*,
         item::{
             item_abi::ItemAbi,
             item_configurable::ItemConfigurable,
@@ -25,22 +24,18 @@ pub use {
             FnSignature, Item, ItemKind, TraitType, TypeField,
         },
         keywords::*,
-        literal::{LitBool, LitBoolType, LitChar, LitInt, LitIntType, LitString, Literal},
+        literal::Literal,
         path::{PathExpr, PathType},
         pattern::Pattern,
         punctuated::Punctuated,
-        statement::{Statement, StatementLet},
+        statement::Statement,
         submodule::Submodule,
-        token::{Group, Punct, Spacing, TokenStream, TokenTree},
         ty::Ty,
-        where_clause::{WhereBound, WhereClause},
+        where_clause::WhereClause,
     },
     extension_trait::extension_trait,
     num_bigint::BigUint,
-    serde::{Serialize, Serializer},
-    std::{
-        fmt, marker::PhantomData, mem, ops::ControlFlow, path::PathBuf, str::FromStr, sync::Arc,
-    },
+    serde::Serialize,
     sway_types::{
         ast::{Delimiter, PunctKind},
         Ident, Span, Spanned,

diff --git a/sway-core/src/asm_lang/mod.rs b/sway-core/src/asm_lang/mod.rs
@@ -675,7 +675,7 @@ fn single_reg(
         });
     }
 
-    let reg = match args.get(0) {
+    let reg = match args.first() {
         Some(reg) => reg,
         _ => {
             return Err(
@@ -711,7 +711,7 @@ fn two_regs(
         });
     }
 
-    let (reg, reg2) = match (args.get(0), args.get(1)) {
+    let (reg, reg2) = match (args.first(), args.get(1)) {
         (Some(reg), Some(reg2)) => (reg, reg2),
         _ => {
             return Err(
@@ -755,7 +755,7 @@ fn four_regs(
         });
     }
 
-    let (reg, reg2, reg3, reg4) = match (args.get(0), args.get(1), args.get(2), args.get(3)) {
+    let (reg, reg2, reg3, reg4) = match (args.first(), args.get(1), args.get(2), args.get(3)) {
         (Some(reg), Some(reg2), Some(reg3), Some(reg4)) => (reg, reg2, reg3, reg4),
         _ => {
             return Err(
@@ -820,7 +820,7 @@ fn three_regs(
         });
     }
 
-    let (reg, reg2, reg3) = match (args.get(0), args.get(1), args.get(2)) {
+    let (reg, reg2, reg3) = match (args.first(), args.get(1), args.get(2)) {
         (Some(reg), Some(reg2), Some(reg3)) => (reg, reg2, reg3),
         _ => {
             return Err(
@@ -892,7 +892,7 @@ fn single_reg_imm_18(
             received: args.len(),
         });
     }
-    let reg = match args.get(0) {
+    let reg = match args.first() {
         Some(reg) => reg,
         _ => {
             return Err(
@@ -942,7 +942,7 @@ fn two_regs_imm_12(
             received: args.len(),
         });
     }
-    let (reg, reg2) = match (args.get(0), args.get(1)) {
+    let (reg, reg2) = match (args.first(), args.get(1)) {
         (Some(reg), Some(reg2)) => (reg, reg2),
         _ => {
             return Err(

diff --git a/sway-core/src/control_flow_analysis/mod.rs b/sway-core/src/control_flow_analysis/mod.rs
@@ -39,6 +39,5 @@
 mod analyze_return_paths;
 mod dead_code_analysis;
 mod flow_graph;
-pub use analyze_return_paths::*;
-pub use dead_code_analysis::*;
+
 pub use flow_graph::*;
diff --git a/sway-core/src/decl_engine/mapping.rs b/sway-core/src/decl_engine/mapping.rs
@@ -132,7 +132,7 @@ impl DeclMapping {
                     let func = engines.de().get(&func_id);
 
                     let unify_check = UnifyCheck::non_dynamic_equality(engines);
-                    if let (left, Some(right)) = (self_type, func.parameters.get(0)) {
+                    if let (left, Some(right)) = (self_type, func.parameters.first()) {
                         if unify_check.check(left, right.type_argument.type_id) {
                             mapping.push((source_decl_ref, dest_decl_ref));
                         }

diff --git a/sway-core/src/language/ty/expression/expression_variant.rs b/sway-core/src/language/ty/expression/expression_variant.rs
@@ -771,7 +771,7 @@ impl ReplaceDecls for TyExpressionVariant {
                     ref mut arguments,
                     ..
                 } => {
-                    let filter_type_opt = arguments.get(0).map(|(_, arg)| arg.return_type);
+                    let filter_type_opt = arguments.first().map(|(_, arg)| arg.return_type);
 
                     if let Some(filter_type) = filter_type_opt {
                         let filtered_decl_mapping =

diff --git a/sway-core/src/semantic_analysis/ast_node/declaration/function.rs b/sway-core/src/semantic_analysis/ast_node/declaration/function.rs
@@ -1,6 +1,5 @@
 mod function_parameter;
 
-pub use function_parameter::*;
 use sway_error::{
     error::CompileError,
     handler::{ErrorEmitted, Handler},

diff --git a/sway-core/src/semantic_analysis/ast_node/declaration/mod.rs b/sway-core/src/semantic_analysis/ast_node/declaration/mod.rs
@@ -13,14 +13,4 @@ mod trait_fn;
 mod trait_type;
 mod type_alias;
 
-pub use abi::*;
-pub use function::*;
-pub use impl_trait::*;
-pub use r#enum::*;
-pub use r#struct::*;
-pub use r#trait::*;
-pub use storage::*;
 pub(crate) use supertrait::*;
-pub use trait_fn::*;
-pub use trait_type::*;
-pub use type_alias::*;
diff --git a/sway-core/src/semantic_analysis/ast_node/expression/intrinsic_function.rs b/sway-core/src/semantic_analysis/ast_node/expression/intrinsic_function.rs
@@ -749,7 +749,7 @@ fn type_check_state_store_word(
         TypeInfo::UnsignedInteger(IntegerBits::SixtyFour),
         None,
     ));
-    let type_argument = type_arguments.get(0).map(|targ| {
+    let type_argument = type_arguments.first().map(|targ| {
         let mut ctx =
             ctx.with_type_annotation(type_engine.insert(engines, TypeInfo::Unknown, None));
         let initial_type_info = type_engine
@@ -843,7 +843,7 @@ fn type_check_state_quad(
     ));
     let number_of_slots_exp =
         ty::TyExpression::type_check(handler, ctx.by_ref(), arguments[2].clone())?;
-    let type_argument = type_arguments.get(0).map(|targ| {
+    let type_argument = type_arguments.first().map(|targ| {
         let mut ctx =
             ctx.with_type_annotation(type_engine.insert(engines, TypeInfo::Unknown, None));
         let initial_type_info = type_engine
@@ -1298,7 +1298,7 @@ fn type_check_smo(
     }
 
     // Type check the type argument
-    let type_argument = type_arguments.get(0).map(|targ| {
+    let type_argument = type_arguments.first().map(|targ| {
         let mut ctx = ctx
             .by_ref()
             .with_help_text("")

diff --git a/sway-core/src/semantic_analysis/ast_node/expression/mod.rs b/sway-core/src/semantic_analysis/ast_node/expression/mod.rs
@@ -2,5 +2,4 @@ mod intrinsic_function;
 mod match_expression;
 pub mod typed_expression;
 
-pub use intrinsic_function::*;
 pub(crate) use match_expression::*;