chore: change rust version used by CI to v1.72.0 (FuelLabs#5043)

## Description Changes rust version CI uses to v1.72.0 and nightly to 2023-08-27
tereshinkiria · Aug 28, 2023 · 869200a · 869200a
1 parent 255350e
commit 869200a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 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.71.0
-  NIGHTLY_RUST_VERSION: nightly-2023-04-01
+  RUST_VERSION: 1.72.0
+  NIGHTLY_RUST_VERSION: nightly-2023-08-27
 
 jobs:
   build-sway-lib-core:

diff --git a/sway-ir/src/optimize/misc_demotion.rs b/sway-ir/src/optimize/misc_demotion.rs
@@ -603,12 +603,11 @@ fn wide_cmp_demotion(context: &mut Context, function: Function) -> Result<bool,
 
     // Get ptr to each arg
     for (block, cmp_instr_val) in candidates {
-        let Instruction::Cmp (op, arg1, arg2) = cmp_instr_val
-            .get_instruction(context)
-            .cloned()
-            .unwrap() else {
-                continue;
-            };
+        let Instruction::Cmp(op, arg1, arg2) =
+            cmp_instr_val.get_instruction(context).cloned().unwrap()
+        else {
+            continue;
+        };
 
         let cmp_op_metadata = cmp_instr_val.get_metadata(context);
 
@@ -764,9 +763,10 @@ fn wide_unary_op_demotion(context: &mut Context, function: Function) -> Result<b
         let Instruction::UnaryOp { arg, .. } = binary_op_instr_val
             .get_instruction(context)
             .cloned()
-            .unwrap() else {
-                continue;
-            };
+            .unwrap()
+        else {
+            continue;
+        };
 
         let unary_op_metadata = binary_op_instr_val.get_metadata(context);
 

diff --git a/sway-parse/src/token.rs b/sway-parse/src/token.rs
@@ -1001,9 +1001,9 @@ mod tests {
 
     #[test]
     fn lex_char_escaped_quote() {
-        let input = r#"
+        let input = r"
         '\''
-        "#;
+        ";
         let handler = Handler::default();
         let stream = lex(&handler, &Arc::from(input), 0, input.len(), None).unwrap();
         assert!(handler.consume().0.is_empty());

diff --git a/swayfmt/tests/mod.rs b/swayfmt/tests/mod.rs
@@ -493,7 +493,7 @@ fn main() -> bool {
 #[test]
 fn struct_comments() {
     check(
-        r#"contract;
+        r"contract;
 // This is a comment, for this one to be placed correctly we need to have Module visitor implemented
 pub struct Foo { // Here is a comment
 
@@ -515,8 +515,8 @@ pub struct Foo { // Here is a comment
              //     \|__|    \|_______|\|_______|\|_______|        \|_______|\|__|\|__|\|_______|\_________\
              //                                                                                  \|_________|
 }
-"#,
-        r#"contract;
+",
+        r"contract;
 // This is a comment, for this one to be placed correctly we need to have Module visitor implemented
 pub struct Foo { // Here is a comment
 
@@ -532,7 +532,7 @@ pub struct Foo { // Here is a comment
     //     \|__|    \|_______|\|_______|\|_______|        \|_______|\|__|\|__|\|_______|\_________\
     //                                                                                  \|_________|
 }
-"#,
+",
     );
 }