Merge branch 'main' into feat/res2

Author: abhinavs1920

.github/workflows/rust.yml

@@ -75,7 +75,8 @@ phf = { version = "0.13.1", default-features = false }
 pollster = "0.4.0"
 regex = "1.12.3"
 regress = { version = "0.11.0", features = ["utf16"] }
-reqwest = { version = "0.13.2" }
+reqwest = { version = "0.13.2", default-features = false, features = ["rustls-no-provider"] }
+rustls = { version = "0.23.37", default-features = false, features = ["ring"] }
 rustc-hash = { version = "2.1.1", default-features = false }
 serde_json = "1.0.149"
 serde = "1.0.219"
@@ -144,6 +145,7 @@ aligned-vec = "0.6.4"
 temp-env = "0.3.6"
 strum = { version = "0.28", features = ["derive"] }
 husky-rs = "0.3.2"
+async-channel = "2.5.0"
 
 # ICU4X
 

Cargo.lock

@@ -27,7 +27,8 @@ color-eyre.workspace = true
 cow-utils.workspace = true
 futures-concurrency.workspace = true
 futures-lite.workspace = true
-async-channel = "2.5.0"
+async-channel.workspace = true
+rustls.workspace = true
 
 [features]
 default = [

Cargo.toml

@@ -530,6 +530,10 @@ fn main() -> Result<()> {
         .display_env_section(false)
         .install()?;
 
+    rustls::crypto::ring::default_provider()
+        .install_default()
+        .map_err(|_| eyre!("could not install ring as the default crypto provider"))?;
+
     #[cfg(feature = "dhat")]
     let _profiler = dhat::Profiler::new_heap();
 

cli/Cargo.toml

@@ -256,10 +256,10 @@ impl JsValue {
                 0 => return GeneratorResumeKind::Normal,
                 1 => return GeneratorResumeKind::Throw,
                 2 => return GeneratorResumeKind::Return,
-                _ => unreachable!("generator kind must be a integer between 1..=2, got {value}"),
+                _ => unreachable!("generator kind must be an integer between 1..=2, got {value}"),
             }
         }
 
-        unreachable!("generator kind must be a integer type")
+        unreachable!("generator kind must be an integer type")
     }
 }

cli/src/main.rs

@@ -29,7 +29,7 @@ impl Default for RuntimeLimits {
 impl RuntimeLimits {
     /// Return the loop iteration limit.
     ///
-    /// If the limit is exceeded in a loop it will throw and error.
+    /// If the limit is exceeded in a loop it will throw an error.
     ///
     /// The limit value [`u64::MAX`] means that there is no limit.
     #[inline]
@@ -40,7 +40,7 @@ impl RuntimeLimits {
 
     /// Set the loop iteration limit.
     ///
-    /// If the limit is exceeded in a loop it will throw and error.
+    /// If the limit is exceeded in a loop it will throw an error.
     ///
     /// Setting the limit to [`u64::MAX`] means that there is no limit.
     #[inline]

core/engine/src/vm/call_frame/mod.rs

@@ -12,36 +12,42 @@ struct Harness;
 impl Harness {
     #[track_caller]
     fn assert_collections(o: usize) {
-        BOA_GC.with(|current| {
+        let collections = BOA_GC.with(|current| {
             let gc = current.borrow();
-            assert_eq!(gc.runtime.collections, o);
+            gc.runtime.collections
         });
+
+        assert_eq!(collections, o);
     }
 
     #[track_caller]
     fn assert_empty_gc() {
-        BOA_GC.with(|current| {
+        let (is_empty, bytes_allocated) = BOA_GC.with(|current| {
             let gc = current.borrow();
-
-            assert!(gc.strongs.is_empty());
-            assert!(gc.runtime.bytes_allocated == 0);
+            (gc.strongs.is_empty(), gc.runtime.bytes_allocated)
         });
+
+        assert!(is_empty);
+        assert_eq!(bytes_allocated, 0);
     }
 
     #[track_caller]
     fn assert_bytes_allocated() {
-        BOA_GC.with(|current| {
+        let bytes_allocated = BOA_GC.with(|current| {
             let gc = current.borrow();
-            assert!(gc.runtime.bytes_allocated > 0);
+            gc.runtime.bytes_allocated
         });
+
+        assert!(bytes_allocated > 0);
     }
 
     #[track_caller]
     fn assert_exact_bytes_allocated(bytes: usize) {
-        BOA_GC.with(|current| {
+        let bytes_allocated = BOA_GC.with(|current| {
             let gc = current.borrow();
-            assert_eq!(gc.runtime.bytes_allocated, bytes);
+            gc.runtime.bytes_allocated
         });
+        assert_eq!(bytes_allocated, bytes);
     }
 }
 

core/engine/src/vm/runtime_limits.rs

@@ -161,12 +161,13 @@ mod miri {
             Harness::assert_exact_bytes_allocated(root_size);
 
             {
+                let eph_size = size_of::<EphemeronBox<InnerCell, TestCell>>();
                 // Generate a self-referential ephemeron
                 let eph = Ephemeron::new(&root.inner, root.clone());
                 *root.inner.inner.borrow_mut() = Some(eph.clone());
 
                 assert!(eph.value().is_some());
-                Harness::assert_exact_bytes_allocated(56);
+                Harness::assert_exact_bytes_allocated(root_size + eph_size);
             }
 
             *root.inner.inner.borrow_mut() = None;
@@ -190,8 +191,10 @@ mod miri {
             Harness::assert_exact_bytes_allocated(root_size);
 
             let watched = Gc::new(0);
+            let watched_size = size_of::<GcBox<u8>>();
 
             {
+                let eph_size = size_of::<EphemeronBox<u8, TestCell>>();
                 // Generate a self-referential loop of weak and non-weak pointers
                 let chain1 = TestCell {
                     inner: Gc::new(GcRefCell::new(None)),
@@ -212,7 +215,7 @@ mod miri {
 
                 assert!(eph_start.value().is_some());
                 assert!(eph_chain2.value().is_some());
-                Harness::assert_exact_bytes_allocated(168);
+                Harness::assert_exact_bytes_allocated(watched_size + 3 * root_size + 2 * eph_size);
             }
 
             *root.borrow_mut() = None;

core/gc/src/test/mod.rs

@@ -5,7 +5,7 @@
 //!  - [ECMAScript specification][spec]
 //!
 //! [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements#Declarations
-//! [spec]:https://tc39.es/ecma262/#sec-declarations-and-the-variable-statement
+//! [spec]: https://tc39.es/ecma262/#sec-declarations-and-the-variable-statement
 
 mod export;
 mod hoistable;