[bfops/rust-smoketests-lib]: revert

Author: bfops

crates/bindings/tests/ui/views.rs

@@ -144,6 +144,7 @@ fn sched_table_view(_: &ViewContext, _args: ScheduledTable) -> Vec<PlayerInfo> {
     vec![]
 }
 
+
 #[table(accessor = player_info)]
 struct PlayerInfo {
     #[unique]

crates/bindings/tests/ui/views.stderr

@@ -61,20 +61,20 @@ error[E0425]: cannot find type `ScheduledTable` in this scope
     |                                             ^^^^^^^^^^^^^^ not found in this scope
 
 error[E0425]: cannot find type `T` in this scope
-   --> tests/ui/views.rs:201:60
+   --> tests/ui/views.rs:202:60
     |
-201 | fn view_nonexistent_table(ctx: &ViewContext) -> impl Query<T> {
+202 | fn view_nonexistent_table(ctx: &ViewContext) -> impl Query<T> {
     |                                                            ^ not found in this scope
     |
 help: you might be missing a type parameter
     |
-201 | fn view_nonexistent_table<T>(ctx: &ViewContext) -> impl Query<T> {
+202 | fn view_nonexistent_table<T>(ctx: &ViewContext) -> impl Query<T> {
     |                          +++
 
 error[E0425]: cannot find type `T` in this scope
-   --> tests/ui/views.rs:201:60
+   --> tests/ui/views.rs:202:60
     |
-201 | fn view_nonexistent_table(ctx: &ViewContext) -> impl Query<T> {
+202 | fn view_nonexistent_table(ctx: &ViewContext) -> impl Query<T> {
     |                                                            ^ not found in this scope
 
 error[E0277]: the trait bound `ViewKind<ReducerContext>: ViewKindTrait` is not satisfied
@@ -411,9 +411,9 @@ help: the trait `SpacetimeType` is not implemented for `NotSpacetimeType`
     = note: required for `Option<NotSpacetimeType>` to implement `SpacetimeType`
 
 error[E0277]: the trait bound `{integer}: RHS<Player, spacetimedb::Identity>` is not satisfied
-   --> tests/ui/views.rs:159:49
+   --> tests/ui/views.rs:160:49
     |
-159 |     ctx.from.player().r#where(|a| a.identity.eq(42)).build()
+160 |     ctx.from.player().r#where(|a| a.identity.eq(42)).build()
     |                                              -- ^^ the trait `RHS<Player, spacetimedb::Identity>` is not implemented for `{integer}`
     |                                              |
     |                                              required by a bound introduced by this call
@@ -435,9 +435,9 @@ note: required by a bound in `Col::<T, V>::eq`
     |                  ^^^^^^^^^ required by this bound in `Col::<T, V>::eq`
 
 error[E0277]: the trait bound `u32: RHS<PlayerInfo, u8>` is not satisfied
-   --> tests/ui/views.rs:165:49
+   --> tests/ui/views.rs:166:49
     |
-165 |     ctx.from.player_info().r#where(|a| a.age.eq(4200u32)).build()
+166 |     ctx.from.player_info().r#where(|a| a.age.eq(4200u32)).build()
     |                                              -- ^^^^^^^ the trait `RHS<PlayerInfo, u8>` is not implemented for `u32`
     |                                              |
     |                                              required by a bound introduced by this call
@@ -457,9 +457,9 @@ note: required by a bound in `Col::<T, V>::eq`
     = note: this error originates in the macro `impl_rhs` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
-   --> tests/ui/views.rs:174:62
+   --> tests/ui/views.rs:175:62
     |
-174 |         .left_semijoin(ctx.from.player(), |a, b| a.weight.eq(b.identity))
+175 |         .left_semijoin(ctx.from.player(), |a, b| a.weight.eq(b.identity))
     |                                                           -- ^^^^^^^^^^ expected `IxCol<Player, u32>`, found `IxCol<Player, Identity>`
     |                                                           |
     |                                                           arguments to this method are incorrect
@@ -473,15 +473,15 @@ note: method defined here
     |            ^^
 
 error[E0609]: no field `age` on type `&PlayerInfoIxCols`
-   --> tests/ui/views.rs:184:72
+   --> tests/ui/views.rs:185:72
     |
-184 |         .right_semijoin(ctx.from.player_info(), |a, b| a.identity.eq(b.age))
+185 |         .right_semijoin(ctx.from.player_info(), |a, b| a.identity.eq(b.age))
     |                                                                        ^^^ unknown field
     |
     = note: available fields are: `identity`, `weight`
 
 error[E0599]: no method named `xyz` found for struct `QueryBuilder` in the current scope
-   --> tests/ui/views.rs:202:14
+   --> tests/ui/views.rs:203:14
     |
-202 |     ctx.from.xyz().build()
+203 |     ctx.from.xyz().build()
     |              ^^^ method not found in `QueryBuilder`

tools/xtask-llm-benchmark/src/benchmarks/basics/t_004_insert/spec.rs

@@ -8,22 +8,24 @@ pub fn spec() -> BenchmarkSpec {
         let mut v = default_schema_parity_scorers(host_url, file!(), route_tag);
         let casing = casing_for_lang(lang);
         let sb = SqlBuilder::new(casing);
-        let select = sb.select_by_id(&table_name("user", lang), &["id", "name", "age", "active"], "id", 1);
+        let select = sb.select_by_id(&table_name("user", lang), &["id","name","age","active"], "id", 1);
         let reducer_name = ident("InsertUser", crate::eval::Casing::Snake);
 
-        v.push(make_reducer_data_parity_scorer(
-            host_url,
-            ReducerDataParityConfig {
-                src_file: file!(),
-                route_tag,
-                reducer: reducer_name.into(),
-                args: vec![Value::from(1), Value::from("Alice"), Value::from(30), Value::from(true)],
-                select_query: select.clone(),
-                id_str: "data_parity_insert_user",
-                collapse_ws: true,
-                timeout: time::Duration::from_secs(10),
-            },
-        ));
+        v.push(make_reducer_data_parity_scorer(host_url, ReducerDataParityConfig {
+            src_file: file!(),
+            route_tag,
+            reducer: reducer_name.into(),
+            args: vec![
+                Value::from(1),
+                Value::from("Alice"),
+                Value::from(30),
+                Value::from(true),
+            ],
+            select_query: select.clone(),
+            id_str: "data_parity_insert_user",
+            collapse_ws: true,
+            timeout: time::Duration::from_secs(10),
+        }));
         v
     })
 }

tools/xtask-llm-benchmark/src/benchmarks/basics/t_005_update/spec.rs

@@ -1,5 +1,7 @@
 use crate::eval::defaults::{
-    default_schema_parity_scorers, make_reducer_data_parity_scorer, make_sql_exec_both_scorer,
+    default_schema_parity_scorers,
+    make_reducer_data_parity_scorer,
+    make_sql_exec_both_scorer,
 };
 use crate::eval::{casing_for_lang, ident, table_name, BenchmarkSpec, ReducerDataParityConfig, SqlBuilder};
 use serde_json::Value;
@@ -12,12 +14,8 @@ pub fn spec() -> BenchmarkSpec {
         let casing = casing_for_lang(lang);
         let sb = SqlBuilder::new(casing);
         let user_table = table_name("user", lang);
-        let seed = sb.insert_values(
-            &user_table,
-            &["id", "name", "age", "active"],
-            &["1", "'Alice'", "30", "true"],
-        );
-        let select = sb.select_by_id(&user_table, &["id", "name", "age", "active"], "id", 1);
+        let seed = sb.insert_values(&user_table, &["id","name","age","active"], &["1","'Alice'","30","true"]);
+        let select = sb.select_by_id(&user_table, &["id","name","age","active"], "id", 1);
         let reducer_name = ident("UpdateUser", crate::eval::Casing::Snake);
 
         v.push(make_sql_exec_both_scorer(
@@ -29,24 +27,21 @@ pub fn spec() -> BenchmarkSpec {
             time::Duration::from_secs(10),
         ));
 
-        v.push(make_reducer_data_parity_scorer(
-            host_url,
-            ReducerDataParityConfig {
-                src_file: file!(),
-                route_tag,
-                reducer: reducer_name.into(),
-                args: vec![
-                    Value::from(1),
-                    Value::from("Alice2"),
-                    Value::from(31),
-                    Value::from(false),
-                ],
-                select_query: select.clone(),
-                id_str: "data_parity_update_user",
-                collapse_ws: true,
-                timeout: time::Duration::from_secs(10),
-            },
-        ));
+        v.push(make_reducer_data_parity_scorer(host_url, ReducerDataParityConfig {
+            src_file: file!(),
+            route_tag,
+            reducer: reducer_name.into(),
+            args: vec![
+                Value::from(1),
+                Value::from("Alice2"),
+                Value::from(31),
+                Value::from(false),
+            ],
+            select_query: select.clone(),
+            id_str: "data_parity_update_user",
+            collapse_ws: true,
+            timeout: time::Duration::from_secs(10),
+        }));
 
         v
     })

tools/xtask-llm-benchmark/src/benchmarks/basics/t_006_delete/spec.rs

@@ -1,4 +1,8 @@
-use crate::eval::defaults::{default_schema_parity_scorers, make_reducer_sql_count_scorer, make_sql_exec_both_scorer};
+use crate::eval::defaults::{
+    default_schema_parity_scorers,
+    make_reducer_sql_count_scorer,
+    make_sql_exec_both_scorer,
+};
 use crate::eval::{casing_for_lang, ident, table_name, BenchmarkSpec, ReducerSqlCountConfig, SqlBuilder};
 use serde_json::Value;
 use std::time;
@@ -10,11 +14,7 @@ pub fn spec() -> BenchmarkSpec {
         let casing = casing_for_lang(lang);
         let sb = SqlBuilder::new(casing);
         let user_table = table_name("user", lang);
-        let seed = sb.insert_values(
-            &user_table,
-            &["id", "name", "age", "active"],
-            &["1", "'Alice'", "30", "true"],
-        );
+        let seed = sb.insert_values(&user_table, &["id","name","age","active"], &["1","'Alice'","30","true"]);
         let count = sb.count_by_id(&user_table, "id", 1);
         let reducer_name = ident("DeleteUser", crate::eval::Casing::Snake);
 
@@ -27,19 +27,16 @@ pub fn spec() -> BenchmarkSpec {
             time::Duration::from_secs(10),
         ));
 
-        v.push(make_reducer_sql_count_scorer(
-            host_url,
-            ReducerSqlCountConfig {
-                src_file: file!(),
-                route_tag,
-                reducer: reducer_name.into(),
-                args: vec![Value::from(1)],
-                sql_count_query: count.clone(),
-                expected_count: 0,
-                id_str: "delete_user_count_zero",
-                timeout: time::Duration::from_secs(10),
-            },
-        ));
+        v.push(make_reducer_sql_count_scorer(host_url, ReducerSqlCountConfig {
+            src_file: file!(),
+            route_tag,
+            reducer: reducer_name.into(),
+            args: vec![Value::from(1)],
+            sql_count_query: count.clone(),
+            expected_count: 0,
+            id_str: "delete_user_count_zero",
+            timeout: time::Duration::from_secs(10),
+        }));
 
         v
     })

tools/xtask-llm-benchmark/src/benchmarks/basics/t_007_crud/spec.rs

@@ -1,6 +1,4 @@
-use crate::eval::defaults::{
-    default_schema_parity_scorers, make_reducer_data_parity_scorer, make_sql_count_only_scorer,
-};
+use crate::eval::defaults::{default_schema_parity_scorers, make_reducer_data_parity_scorer, make_sql_count_only_scorer};
 use crate::eval::{casing_for_lang, ident, table_name, BenchmarkSpec, ReducerDataParityConfig, SqlBuilder};
 use std::time::Duration;
 
@@ -13,42 +11,27 @@ pub fn spec() -> BenchmarkSpec {
         let reducer = ident("Crud", crate::eval::Casing::Snake);
         let user_table = table_name("user", lang);
 
-        let select_id1 = sb.select_by_id(&user_table, &["id", "name", "age", "active"], "id", 1);
-        let count_id2 = sb.count_by_id(&user_table, "id", 2);
-        let count_all = format!("SELECT COUNT(*) AS n FROM {user_table}");
+        let select_id1 = sb.select_by_id(&user_table, &["id","name","age","active"], "id", 1);
+        let count_id2  = sb.count_by_id(&user_table, "id", 2);
+        let count_all  = format!("SELECT COUNT(*) AS n FROM {user_table}");
 
-        v.push(make_reducer_data_parity_scorer(
-            host_url,
-            ReducerDataParityConfig {
-                src_file: file!(),
-                route_tag,
-                reducer: reducer.into(),
-                args: vec![],
-                select_query: select_id1.clone(),
-                id_str: "crud_row_id1_parity",
-                collapse_ws: true,
-                timeout: Duration::from_secs(10),
-            },
-        ));
-        v.push(make_sql_count_only_scorer(
-            host_url,
-            file!(),
+        v.push(make_reducer_data_parity_scorer(host_url, ReducerDataParityConfig {
+            src_file: file!(),
             route_tag,
-            &count_id2,
-            0,
-            "crud_row_id2_deleted",
-            Duration::from_secs(10),
+            reducer: reducer.into(),
+            args: vec![],
+            select_query: select_id1.clone(),
+            id_str: "crud_row_id1_parity",
+            collapse_ws: true,
+            timeout: Duration::from_secs(10),
+        }));
+        v.push(make_sql_count_only_scorer(
+            host_url, file!(), route_tag, &count_id2, 0, "crud_row_id2_deleted", Duration::from_secs(10),
         ));
         v.push(make_sql_count_only_scorer(
-            host_url,
-            file!(),
-            route_tag,
-            count_all,
-            1,
-            "crud_total_count_one",
-            Duration::from_secs(10),
+            host_url, file!(), route_tag, count_all, 1, "crud_total_count_one", Duration::from_secs(10),
         ));
 
         v
     })
-}
+}

tools/xtask-llm-benchmark/src/benchmarks/basics/t_008_index_lookup/spec.rs

@@ -1,5 +1,7 @@
 use crate::eval::defaults::{
-    default_schema_parity_scorers, make_reducer_data_parity_scorer, make_sql_exec_both_scorer,
+    default_schema_parity_scorers,
+    make_reducer_data_parity_scorer,
+    make_sql_exec_both_scorer,
 };
 use crate::eval::{casing_for_lang, ident, table_name, BenchmarkSpec, ReducerDataParityConfig, SqlBuilder};
 use serde_json::Value;
@@ -18,8 +20,8 @@ pub fn spec() -> BenchmarkSpec {
         // Seed a user row in both DBs so the lookup has something to find
         let seed_users = sb.insert_values(
             &user_table,
-            &["id", "name", "age", "active"],
-            &["1", "'Alice'", "30", "true"],
+            &["id","name","age","active"],
+            &["1","'Alice'","30","true"],
         );
 
         v.push(make_sql_exec_both_scorer(
@@ -32,21 +34,23 @@ pub fn spec() -> BenchmarkSpec {
         ));
 
         // After calling the reducer, the projection should be present in results
-        let select_result = sb.select_by_id(&result_table, &["id", "name"], "id", 1);
+        let select_result = sb.select_by_id(
+            &result_table,
+            &["id","name"],
+            "id",
+            1,
+        );
 
-        v.push(make_reducer_data_parity_scorer(
-            host_url,
-            ReducerDataParityConfig {
-                src_file: file!(),
-                route_tag,
-                reducer: reducer_name.into(),
-                args: vec![Value::from(1)],
-                select_query: select_result.clone(),
-                id_str: "index_lookup_projection_parity",
-                collapse_ws: true,
-                timeout: Duration::from_secs(10),
-            },
-        ));
+        v.push(make_reducer_data_parity_scorer(host_url, ReducerDataParityConfig {
+            src_file: file!(),
+            route_tag,
+            reducer: reducer_name.into(),
+            args: vec![Value::from(1)],
+            select_query: select_result.clone(),
+            id_str: "index_lookup_projection_parity",
+            collapse_ws: true,
+            timeout: Duration::from_secs(10),
+        }));
 
         v
     })