From 98deb58aae6729ee1b61b20d7e5ae98c850abcbe Mon Sep 17 00:00:00 2001 From: neeldug <5161147+neeldug@users.noreply.github.com> Date: Sun, 11 Oct 2020 20:09:14 +0100 Subject: [PATCH] style(boa): minor cleanup (#838) --- boa/src/builtins/array/mod.rs | 10 +++++----- boa/src/builtins/number/mod.rs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/boa/src/builtins/array/mod.rs b/boa/src/builtins/array/mod.rs index 999ec1f8c3..448f75ae8c 100644 --- a/boa/src/builtins/array/mod.rs +++ b/boa/src/builtins/array/mod.rs @@ -1088,14 +1088,14 @@ impl Array { let initial_value = args.get(1).cloned().unwrap_or_else(Value::undefined); let mut length = this.get_field("length").to_length(interpreter)?; if length == 0 { - if initial_value.is_undefined() { - return interpreter.throw_type_error( + return if initial_value.is_undefined() { + interpreter.throw_type_error( "reduceRight was called on an empty array and with no initial value", - ); + ) } else { // early return to prevent usize subtraction errors - return Ok(initial_value); - } + Ok(initial_value) + }; } let mut k = length - 1; let mut accumulator = if initial_value.is_undefined() { diff --git a/boa/src/builtins/number/mod.rs b/boa/src/builtins/number/mod.rs index 4d5cb218bc..41970e8a35 100644 --- a/boa/src/builtins/number/mod.rs +++ b/boa/src/builtins/number/mod.rs @@ -354,7 +354,7 @@ impl Number { fraction -= digit as f64; // Round to even. if fraction + delta > 1.0 - && (fraction > 0.5 || (fraction - 0.5) < f64::EPSILON && digit & 1 != 0) + && (fraction > 0.5 || (fraction - 0.5).abs() < f64::EPSILON && digit & 1 != 0) { loop { // We need to back trace already written digits in case of carry-over. @@ -523,12 +523,12 @@ impl Number { if radix == 0 { if s.starts_with("0x") || s.starts_with("0X") { - if let Ok(i) = i32::from_str_radix(&s[2..], 16) { - return Ok(Value::integer(i)); + return if let Ok(i) = i32::from_str_radix(&s[2..], 16) { + Ok(Value::integer(i)) } else { // String can't be parsed. - return Ok(Value::from(f64::NAN)); - } + Ok(Value::from(f64::NAN)) + }; } else { radix = 10 };