Merge 8f94f14 into sapling-pr-archive-shadaj

hydro-project · Jan 29, 2025 · f43c437 · f43c437
2 parents 6981dd1 + 8f94f14
commit f43c437
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 52 deletions.
diff --git a/hydro_lang/Cargo.toml b/hydro_lang/Cargo.toml
@@ -40,14 +40,14 @@ syn = { version = "2.0.46", features = [ "parsing", "extra-traits", "visit-mut"
 tokio = { version = "1.29.0", features = [ "full" ] }
 toml = { version = "0.8.0", optional = true }
 trybuild-internals-api = { version = "1.0.99", optional = true }
-ctor = "0.2"
 
 [build-dependencies]
 stageleft_tool = { path = "../stageleft_tool", version = "^0.5.0" }
 
 [dev-dependencies]
 async-ssh2-lite = { version = "0.5.0", features = ["vendored-openssl"] }
 hydro_deploy = { path = "../hydro_deploy/core", version = "^0.11.0" }
+ctor = "0.2"
 insta = "1.39"
 tokio-test = "0.4.4"
 trybuild = "1"
diff --git a/hydro_lang/src/lib.rs b/hydro_lang/src/lib.rs
@@ -46,12 +46,6 @@ mod staging_util;
 #[cfg(feature = "deploy")]
 pub mod test_util;
 
-#[ctor::ctor]
-fn add_private_reexports() {
-    stageleft::add_private_reexport(vec!["tokio", "time", "instant"], vec!["tokio", "time"]);
-    stageleft::add_private_reexport(vec!["bytes", "bytes"], vec!["bytes"]);
-}
-
 #[stageleft::runtime]
 #[cfg(test)]
 mod test_init {

diff --git a/hydro_test/src/cluster/snapshots/hydro_test__cluster__paxos_bench__tests__paxos_ir.snap b/hydro_test/src/cluster/snapshots/hydro_test__cluster__paxos_bench__tests__paxos_ir.snap
@@ -778,23 +778,17 @@ expression: built.ir()
                                                                                         },
                                                                                     },
                                                                                     metadata: HydroNodeMetadata {
-                                                                                        location_kind: Tick(
-                                                                                            1,
-                                                                                            Cluster(
-                                                                                                0,
-                                                                                            ),
+                                                                                        location_kind: Cluster(
+                                                                                            0,
                                                                                         ),
                                                                                         output_type: Some(
                                                                                             hydro_test :: cluster :: paxos :: Ballot,
                                                                                         ),
                                                                                     },
                                                                                 },
                                                                                 metadata: HydroNodeMetadata {
-                                                                                    location_kind: Tick(
-                                                                                        1,
-                                                                                        Cluster(
-                                                                                            0,
-                                                                                        ),
+                                                                                    location_kind: Cluster(
+                                                                                        0,
                                                                                     ),
                                                                                     output_type: Some(
                                                                                         (hydro_lang :: location :: cluster :: cluster_id :: ClusterId < hydro_test :: cluster :: paxos :: Acceptor > , hydro_test :: cluster :: paxos :: Ballot),
@@ -1949,11 +1943,8 @@ expression: built.ir()
                                                                     },
                                                                 },
                                                                 metadata: HydroNodeMetadata {
-                                                                    location_kind: Tick(
-                                                                        7,
-                                                                        Cluster(
-                                                                            2,
-                                                                        ),
+                                                                    location_kind: Cluster(
+                                                                        2,
                                                                     ),
                                                                     output_type: Some(
                                                                         (hydro_lang :: location :: cluster :: cluster_id :: ClusterId < hydro_test :: cluster :: paxos :: Proposer > , hydro_test :: cluster :: kv_replica :: KvPayload < u32 , (hydro_lang :: location :: cluster :: cluster_id :: ClusterId < hydro_test :: cluster :: bench_client :: Client > , u32) >),
@@ -4727,47 +4718,35 @@ expression: built.ir()
                                         },
                                     },
                                     metadata: HydroNodeMetadata {
-                                        location_kind: Tick(
-                                            0,
-                                            Cluster(
-                                                2,
-                                            ),
+                                        location_kind: Cluster(
+                                            2,
                                         ),
                                         output_type: Some(
                                             core :: time :: Duration,
                                         ),
                                     },
                                 },
                                 metadata: HydroNodeMetadata {
-                                    location_kind: Tick(
-                                        0,
-                                        Cluster(
-                                            2,
-                                        ),
+                                    location_kind: Cluster(
+                                        2,
                                     ),
                                     output_type: Some(
                                         core :: time :: Duration,
                                     ),
                                 },
                             },
                             metadata: HydroNodeMetadata {
-                                location_kind: Tick(
-                                    0,
-                                    Cluster(
-                                        2,
-                                    ),
+                                location_kind: Cluster(
+                                    2,
                                 ),
                                 output_type: Some(
                                     (std :: rc :: Rc < core :: cell :: RefCell < std :: vec :: Vec < core :: time :: Duration > > > , usize),
                                 ),
                             },
                         },
                         metadata: HydroNodeMetadata {
-                            location_kind: Tick(
-                                0,
-                                Cluster(
-                                    2,
-                                ),
+                            location_kind: Cluster(
+                                2,
                             ),
                             output_type: Some(
                                 std :: rc :: Rc < core :: cell :: RefCell < std :: vec :: Vec < core :: time :: Duration > > >,
@@ -4930,23 +4909,17 @@ expression: built.ir()
                             },
                         },
                         metadata: HydroNodeMetadata {
-                            location_kind: Tick(
-                                0,
-                                Cluster(
-                                    2,
-                                ),
+                            location_kind: Cluster(
+                                2,
                             ),
                             output_type: Some(
                                 usize,
                             ),
                         },
                     },
                     metadata: HydroNodeMetadata {
-                        location_kind: Tick(
-                            0,
-                            Cluster(
-                                2,
-                            ),
+                        location_kind: Cluster(
+                            2,
                         ),
                         output_type: Some(
                             (std :: rc :: Rc < core :: cell :: RefCell < std :: vec :: Vec < core :: time :: Duration > > > , usize),

diff --git a/stageleft/src/type_name.rs b/stageleft/src/type_name.rs
@@ -22,6 +22,8 @@ static PRIVATE_REEXPORTS: ReexportsSet = LazyLock::new(|| {
             vec!["std", "collections", "hash_set"],
         ),
         (vec!["std", "vec", "into_iter"], vec!["std", "vec"]),
+        (vec!["tokio", "time", "instant"], vec!["tokio", "time"]),
+        (vec!["bytes", "bytes"], vec!["bytes"]),
     ])
 });