Format let-else expressions (#3102)

boa_cli/src/debug/limits.rs

@@ -23,9 +23,9 @@ fn get_recursion(_: &JsValue, _: &[JsValue], context: &mut Context<'_>) -> JsRes
 fn set_recursion(_: &JsValue, args: &[JsValue], context: &mut Context<'_>) -> JsResult<JsValue> {
     let value = args.get_or_undefined(0).to_length(context)?;
     let Ok(value) = value.try_into() else {
-        return Err(
+        return Err(JsNativeError::range()
-            JsNativeError::range().with_message(format!("Argument {value} greater than usize::MAX")).into()
+            .with_message(format!("Argument {value} greater than usize::MAX"))
-        );
+            .into());
     };
     context.runtime_limits_mut().set_recursion_limit(value);
     Ok(JsValue::undefined())

boa_cli/src/debug/shape.rs

@@ -8,7 +8,10 @@ fn get_object(args: &[JsValue], position: usize) -> JsResult<&JsObject> {
 
     let Some(object) = value.as_object() else {
         return Err(JsNativeError::typ()
-        .with_message(format!("expected object in argument position {position}, got {}", value.type_of()))
+            .with_message(format!(
+                "expected object in argument position {position}, got {}",
+                value.type_of()
+            ))
             .into());
     };
 

boa_engine/src/builtins/date/mod.rs

@@ -297,7 +297,11 @@ impl Date {
         context: &mut Context<'_>,
     ) -> JsResult<Option<NaiveDateTime>> {
         // 1. Let y be ? ToNumber(year).
-        let Some(mut year) = values.get_or_undefined(0).to_integer_or_nan(context)?.as_integer() else {
+        let Some(mut year) = values
+            .get_or_undefined(0)
+            .to_integer_or_nan(context)?
+            .as_integer()
+        else {
             return Ok(None);
         };
 
@@ -306,7 +310,8 @@ impl Date {
             value
                 .to_integer_or_nan(context)
                 .map(IntegerOrNan::as_integer)
-        })? else {
+        })?
+        else {
             return Ok(None);
         };
 
@@ -315,7 +320,8 @@ impl Date {
             value
                 .to_integer_or_nan(context)
                 .map(IntegerOrNan::as_integer)
-        })? else {
+        })?
+        else {
             return Ok(None);
         };
 
@@ -324,7 +330,8 @@ impl Date {
             value
                 .to_integer_or_nan(context)
                 .map(IntegerOrNan::as_integer)
-        })? else {
+        })?
+        else {
             return Ok(None);
         };
 
@@ -333,7 +340,8 @@ impl Date {
             value
                 .to_integer_or_nan(context)
                 .map(IntegerOrNan::as_integer)
-        })? else {
+        })?
+        else {
             return Ok(None);
         };
 
@@ -342,7 +350,8 @@ impl Date {
             value
                 .to_integer_or_nan(context)
                 .map(IntegerOrNan::as_integer)
-        })? else {
+        })?
+        else {
             return Ok(None);
         };
 
@@ -351,7 +360,8 @@ impl Date {
             value
                 .to_integer_or_nan(context)
                 .map(IntegerOrNan::as_integer)
-        })? else {
+        })?
+        else {
             return Ok(None);
         };
 
@@ -1442,7 +1452,7 @@ impl Date {
         // 1. Let O be this Date object.
         let Some(t) = this_time_value(this)?.and_then(NaiveDateTime::from_timestamp_millis) else {
             // 3. If tv is NaN, return "Invalid Date".
-            return Ok(js_string!("Invalid Date").into())
+            return Ok(js_string!("Invalid Date").into());
         };
 
         // 2. Let tv be ? thisTimeValue(O).

boa_engine/src/builtins/escape/mod.rs

@@ -176,7 +176,7 @@ fn unescape(_: &JsValue, args: &[JsValue], context: &mut Context<'_>) -> JsResul
 
                 Some((n1 << 4) + n2)
             }
-            _ => None
+            _ => None,
         })() else {
             vec.push(u16::from(b'%'));
             continue;

boa_engine/src/builtins/generator/mod.rs

@@ -252,19 +252,15 @@ impl Generator {
     ) -> JsResult<JsValue> {
         // 1. Let state be ? GeneratorValidate(generator, generatorBrand).
         let Some(generator_obj) = gen.as_object() else {
-            return Err(
+            return Err(JsNativeError::typ()
-                JsNativeError::typ()
                 .with_message("Generator method called on non generator")
-                    .into()
+                .into());
-            );
         };
         let mut generator_obj_mut = generator_obj.borrow_mut();
         let Some(generator) = generator_obj_mut.as_generator_mut() else {
-            return Err(
+            return Err(JsNativeError::typ()
-                JsNativeError::typ()
                 .with_message("generator resumed on non generator object")
-                    .into()
+                .into());
-            );
         };
 
         // 4. Let genContext be generator.[[GeneratorContext]].
@@ -340,19 +336,15 @@ impl Generator {
     ) -> JsResult<JsValue> {
         // 1. Let state be ? GeneratorValidate(generator, generatorBrand).
         let Some(generator_obj) = gen.as_object() else {
-            return Err(
+            return Err(JsNativeError::typ()
-                JsNativeError::typ()
                 .with_message("Generator method called on non generator")
-                    .into()
+                .into());
-            );
         };
         let mut generator_obj_mut = generator_obj.borrow_mut();
         let Some(generator) = generator_obj_mut.as_generator_mut() else {
-            return Err(
+            return Err(JsNativeError::typ()
-                JsNativeError::typ()
                 .with_message("generator resumed on non generator object")
-                    .into()
+                .into());
-            );
         };
 
         // 4. Assert: state is suspendedYield.

boa_engine/src/builtins/intl/segmenter/iterator.rs

@@ -130,11 +130,17 @@ impl SegmentIterator {
             let mut segments = segmenter.native.segment(string);
             // the first elem is always 0.
             segments.next();
-            segments.next().map(|end| (start + end, segments.is_word_like()))
+            segments
+                .next()
+                .map(|end| (start + end, segments.is_word_like()))
         }) else {
             // 7. If endIndex is not finite, then
             //     a. Return CreateIterResultObject(undefined, true).
-            return Ok(create_iter_result_object(JsValue::undefined(), true, context));
+            return Ok(create_iter_result_object(
+                JsValue::undefined(),
+                true,
+                context,
+            ));
         };
         // 8. Set iterator.[[IteratedStringNextSegmentCodeUnitIndex]] to endIndex.
         iter.next_segment_index = end;

boa_engine/src/builtins/intl/segmenter/segments.rs

@@ -94,7 +94,8 @@ impl Segments {
             .as_integer()
             // 7. If n < 0 or n ≥ len, return undefined.
             .filter(|i| (0..len).contains(i))
-            .map(|n| n as usize) else {
+            .map(|n| n as usize)
+        else {
             return Ok(JsValue::undefined());
         };
 

boa_engine/src/builtins/promise/mod.rs

@@ -1530,7 +1530,11 @@ impl Promise {
 
         let on_finally = args.get_or_undefined(0);
 
-        let Some(on_finally) = on_finally.as_object().cloned().and_then(JsFunction::from_object) else {
+        let Some(on_finally) = on_finally
+            .as_object()
+            .cloned()
+            .and_then(JsFunction::from_object)
+        else {
             // 5. If IsCallable(onFinally) is false, then
             //    a. Let thenFinally be onFinally.
             //    b. Let catchFinally be onFinally.
@@ -2026,7 +2030,7 @@ impl Promise {
                     // 5. If alreadyResolved.[[Value]] is true, return undefined.
                     // 6. Set alreadyResolved.[[Value]] to true.
                     let Some(promise) = captures.take() else {
-                        return Ok(JsValue::undefined())
+                        return Ok(JsValue::undefined());
                     };
 
                     let resolution = args.get_or_undefined(0);
@@ -2069,7 +2073,11 @@ impl Promise {
                     };
 
                     // 12. If IsCallable(thenAction) is false, then
-                    let Some(then_action) = then_action.as_object().cloned().and_then(JsFunction::from_object) else {
+                    let Some(then_action) = then_action
+                        .as_object()
+                        .cloned()
+                        .and_then(JsFunction::from_object)
+                    else {
                         // a. Perform FulfillPromise(promise, resolution).
                         fulfill_promise(&promise, resolution.clone(), context);
 
@@ -2078,14 +2086,15 @@ impl Promise {
                     };
 
                     // 13. Let thenJobCallback be HostMakeJobCallback(thenAction).
-                    let then_job_callback = context.host_hooks().make_job_callback(then_action, context);
+                    let then_job_callback =
+                        context.host_hooks().make_job_callback(then_action, context);
 
                     // 14. Let job be NewPromiseResolveThenableJob(promise, resolution, thenJobCallback).
                     let job = new_promise_resolve_thenable_job(
                         promise.clone(),
                         resolution.clone(),
                         then_job_callback,
-                        context
+                        context,
                     );
 
                     // 15. Perform HostEnqueuePromiseJob(job.[[Job]], job.[[Realm]]).

boa_engine/src/builtins/set/mod.rs

@@ -341,7 +341,10 @@ impl Set {
         _: &[JsValue],
         context: &mut Context<'_>,
     ) -> JsResult<JsValue> {
-        let Some(lock) = this.as_object().and_then(|o| o.borrow_mut().as_set_mut().map(|set| set.lock(o.clone()))) else {
+        let Some(lock) = this
+            .as_object()
+            .and_then(|o| o.borrow_mut().as_set_mut().map(|set| set.lock(o.clone())))
+        else {
             return Err(JsNativeError::typ()
                 .with_message("Method Set.prototype.entries called on incompatible receiver")
                 .into());
@@ -372,7 +375,10 @@ impl Set {
     ) -> JsResult<JsValue> {
         // 1. Let S be the this value.
         // 2. Perform ? RequireInternalSlot(S, [[SetData]]).
-        let Some(lock) = this.as_object().and_then(|o| o.borrow_mut().as_set_mut().map(|set| set.lock(o.clone()))) else {
+        let Some(lock) = this
+            .as_object()
+            .and_then(|o| o.borrow_mut().as_set_mut().map(|set| set.lock(o.clone())))
+        else {
             return Err(JsNativeError::typ()
                 .with_message("Method Set.prototype.forEach called on incompatible receiver")
                 .into());
@@ -381,7 +387,9 @@ impl Set {
         // 3. If IsCallable(callbackfn) is false, throw a TypeError exception.
         let Some(callback_fn) = args.get_or_undefined(0).as_callable() else {
             return Err(JsNativeError::typ()
-                .with_message("Method Set.prototype.forEach called with non-callable callback function")
+                .with_message(
+                    "Method Set.prototype.forEach called with non-callable callback function",
+                )
                 .into());
         };
 
@@ -393,7 +401,10 @@ impl Set {
         // 7. Repeat, while index < numEntries,
         while index < Self::get_size_full(this)? {
             // a. Let e be entries[index].
-            let Some(e) = this.as_object().and_then(|o| o.borrow().as_set().map(|s| s.get_index(index).cloned())) else {
+            let Some(e) = this
+                .as_object()
+                .and_then(|o| o.borrow().as_set().map(|s| s.get_index(index).cloned()))
+            else {
                 return Err(JsNativeError::typ()
                     .with_message("Method Set.prototype.forEach called on incompatible receiver")
                     .into());
@@ -474,7 +485,10 @@ impl Set {
         _: &[JsValue],
         context: &mut Context<'_>,
     ) -> JsResult<JsValue> {
-        let Some(lock) = this.as_object().and_then(|o| o.borrow_mut().as_set_mut().map(|set| set.lock(o.clone()))) else {
+        let Some(lock) = this
+            .as_object()
+            .and_then(|o| o.borrow_mut().as_set_mut().map(|set| set.lock(o.clone())))
+        else {
             return Err(JsNativeError::typ()
                 .with_message("Method Set.prototype.values called on incompatible receiver")
                 .into());

boa_engine/src/class.rs

@@ -131,7 +131,8 @@ impl<T: Class> ClassConstructor for T {
                 .into());
         };
 
-        let JsValue::Object(ref class_prototype) = class_constructor.get(PROTOTYPE, context)? else {
+        let JsValue::Object(ref class_prototype) = class_constructor.get(PROTOTYPE, context)?
+        else {
             return Err(JsNativeError::typ()
                 .with_message(format!(
                     "invalid default prototype for native class `{}`",

boa_engine/src/lib.rs

@@ -426,7 +426,11 @@ fn run_test_actions_with(actions: impl IntoIterator<Item = TestAction>, context:
                     Err(e) => e,
                 };
                 let Some(err) = err.as_opaque() else {
-                    panic!("{}\nExpected opaque error, got native error `{}`", fmt_test(&source, i), err)
+                    panic!(
+                        "{}\nExpected opaque error, got native error `{}`",
+                        fmt_test(&source, i),
+                        err
+                    )
                 };
 
                 assert_eq!(err, &expected, "{}", fmt_test(&source, i));

boa_engine/src/module/source.rs

@@ -1151,7 +1151,10 @@ impl SourceTextModule {
         if pending_async_dependencies > 0 || self.inner.code.has_tla {
             // a. Assert: module.[[AsyncEvaluation]] is false and was never previously set to true.
             {
-                let Status::Evaluating { async_eval_index, .. } = &mut *self.inner.status.borrow_mut() else {
+                let Status::Evaluating {
+                    async_eval_index, ..
+                } = &mut *self.inner.status.borrow_mut()
+                else {
                     unreachable!("self should still be in the evaluating state")
                 };
 
@@ -1326,7 +1329,11 @@ impl SourceTextModule {
                     // i. Assert: m.[[Status]] is evaluating-async.
                     // ii. Assert: m.[[EvaluationError]] is empty.
                     // iii. Assert: m.[[AsyncEvaluation]] is true.
-                    let Status::EvaluatingAsync { pending_async_dependencies, .. } = &mut *m.inner.status.borrow_mut() else {
+                    let Status::EvaluatingAsync {
+                        pending_async_dependencies,
+                        ..
+                    } = &mut *m.inner.status.borrow_mut()
+                    else {
                         unreachable!("i. Assert: m.[[Status]] is evaluating-async.");
                     };
                     // iv. Assert: m.[[PendingAsyncDependencies]] > 0.
@@ -1842,7 +1849,10 @@ fn async_module_execution_fulfilled(module: &SourceTextModule, context: &mut Con
 
     // 10. Let sortedExecList be a List whose elements are the elements of execList, in the order in which they had their [[AsyncEvaluation]] fields set to true in InnerModuleEvaluation.
     ancestors.sort_by_cached_key(|m| {
-        let Status::EvaluatingAsync { async_eval_index, .. } = &*m.inner.status.borrow() else {
+        let Status::EvaluatingAsync {
+            async_eval_index, ..
+        } = &*m.inner.status.borrow()
+        else {
             unreachable!("GatherAvailableAncestors: i. Assert: m.[[Status]] is evaluating-async.");
         };
 

boa_engine/src/object/internal_methods/module_namespace.rs

@@ -233,9 +233,11 @@ fn module_namespace_exotic_get(
         let Some(env) = target_module.environment() else {
             // 11. If targetEnv is empty, throw a ReferenceError exception.
             let import = context.interner().resolve_expect(export_name);
-            return Err(JsNativeError::reference().with_message(
+            return Err(JsNativeError::reference()
-                format!("cannot get import `{import}` from an uninitialized module")
+                .with_message(format!(
-            ).into());
+                    "cannot get import `{import}` from an uninitialized module"
+                ))
+                .into());
         };
 
         let locator = env

boa_engine/src/object/shape/slot.rs

@@ -66,7 +66,7 @@ impl Slot {
             return Self {
                 index: 0,
                 attributes: new_attributes,
-            }
+            };
         };
 
         Self {

boa_engine/src/string/mod.rs

@@ -320,7 +320,9 @@ impl JsString {
                     let Some(cp) = self.codepoints.peek().and_then(|cp| match cp {
                         CodePoint::Unicode(c) => Some(*c),
                         CodePoint::UnpairedSurrogate(_) => None,
-                    }) else { break; };
+                    }) else {
+                        break;
+                    };
 
                     string.push(cp);
 

boa_engine/src/vm/opcode/iteration/iterator.rs

@@ -174,7 +174,10 @@ impl Operation for IteratorReturn {
             .pop()
             .expect("iterator on the call frame must exist");
 
-        let Some(ret) = record.iterator().get_method(js_string!("return"), context)? else {
+        let Some(ret) = record
+            .iterator()
+            .get_method(js_string!("return"), context)?
+        else {
             context.vm.push(false);
             return Ok(CompletionType::Normal);
         };

boa_macros/src/lib.rs

@@ -90,8 +90,10 @@ impl Parse for Static {
                     ));
                 }
                 let Expr::Lit(ExprLit {
-                    lit: Lit::Str(literal), ..
+                    lit: Lit::Str(literal),
-                }) = literal else {
+                    ..
+                }) = literal
+                else {
                     return Err(syn::Error::new_spanned(
                         literal,
                         "expected an UTF-8 string literal",

boa_parser/src/lexer/mod.rs

@@ -344,7 +344,7 @@ impl<R> Lexer<R> {
     {
         loop {
             let Some(next) = self.next_no_skip(interner)? else {
-                return Ok(None)
+                return Ok(None);
             };
 
             if next.kind() != &TokenKind::Comment {

boa_parser/src/parser/expression/primary/object_initializer/mod.rs

@@ -227,7 +227,9 @@ where
                         return Err(Error::general("invalid super usage", position));
                     }
 
-                    let property::ClassElementName::PropertyName(property_name) = class_element_name else {
+                    let property::ClassElementName::PropertyName(property_name) =
+                        class_element_name
+                    else {
                         return Err(Error::general(
                             "private identifiers not allowed in object literal",
                             position,
@@ -242,7 +244,8 @@ where
                 let (class_element_name, method) =
                     AsyncMethod::new(self.allow_yield, self.allow_await).parse(cursor, interner)?;
 
-                let property::ClassElementName::PropertyName(property_name) = class_element_name else {
+                let property::ClassElementName::PropertyName(property_name) = class_element_name
+                else {
                     return Err(Error::general(
                         "private identifiers not allowed in object literal",
                         position,

boa_parser/src/parser/function/mod.rs

@@ -75,7 +75,8 @@ where
         let Some(start_position) = cursor
             .peek(0, interner)?
             .filter(|&tok| tok.kind() != &TokenKind::Punctuator(Punctuator::CloseParen))
-            .map(|tok| tok.span().start()) else {
+            .map(|tok| tok.span().start())
+        else {
             return Ok(FormalParameterList::default());
         };
 

boa_parser/src/parser/statement/declaration/mod.rs

@@ -133,7 +133,7 @@ where
                 tok.to_string(interner),
                 tok.span(),
                 self.context,
-            ))
+            ));
         };
 
         Ok((*from).into())

boa_runtime/src/lib.rs

@@ -273,7 +273,11 @@ pub(crate) mod test {
                         Err(e) => e,
                     };
                     let Some(err) = err.as_opaque() else {
-                    panic!("{}\nExpected opaque error, got native error `{}`", fmt_test(&source, i), err)
+                        panic!(
+                            "{}\nExpected opaque error, got native error `{}`",
+                            fmt_test(&source, i),
+                            err
+                        )
                     };
 
                     assert_eq!(err, &expected, "{}", fmt_test(&source, i));

boa_tester/src/exec/mod.rs

@@ -186,8 +186,8 @@ impl Test {
                 edition: self.edition,
                 strict,
                 result: TestOutcomeResult::Failed,
-                result_text: Box::from("Could not read test file.")
+                result_text: Box::from("Could not read test file."),
-            }
+            };
         };
         if self.ignored {
             if verbose > 1 {