Fix test generation

.github/workflows/ci.yml

@@ -47,6 +47,21 @@ jobs:
           command: test
           args: --no-default-features --features alloc
 
+  workspace-compiles:
+    name: "Workspace Compiles"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --workspace
+
   fmt:
     name: Rustfmt
     runs-on: ubuntu-latest

scripts/gentest/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
 name = "gentest"
 version = "0.1.0"
-authors = ["Emil Sjölander <emil@visly.app>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 env_logger = "0.9.0"
 failure = "0.1"
 fantoccini = "0.19.0"
 futures = "0.3"
 indicatif = "0.16.2"
-json = "0.12.0"
+json = "0.12.4"
 log = "0.4"
 proc-macro2 = "1.0.6"
-quote = "1.0.2"
+quote = "1.0"
 serde_json = "1"
-syn = "1.0.7"
-tokio = "1.18"
+syn = "1.0.9"
+tokio = "1.19"

scripts/gentest/src/main.rs

@@ -2,11 +2,11 @@ use std::fs;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
-use failure::*;
+use failure::Error;
 use fantoccini::{Client, Locator};
-use futures::{future::Future, stream::Stream, sync::oneshot::channel};
+use futures::{channel::oneshot::channel, future::Future};
 use json;
-use log::*;
+use log::{debug, error, info};
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
 use syn::Ident;
@@ -49,7 +49,9 @@ fn main() {
     let (test_descs_sink, mut test_descs) = channel();
 
     info!("spawning webdriver client and collecting test descriptions");
+    // FIXME: this method no longer exists
     tokio::run(
+        // FIXME: seems to be replaced by https://docs.rs/fantoccini/latest/fantoccini/struct.Client.html#method.with_capabilities_and_connector
         Client::with_capabilities(webdriver_url, caps.clone())
             .map_err(|e| Error::from(e))
             .and_then(move |client| {
@@ -89,6 +91,7 @@ fn main() {
         })
         .collect();
 
+    // FIXME: type is unclear
     let test_descs: Vec<_> = test_descs
         .iter()
         .map(|(name, description)| {
@@ -97,6 +100,7 @@ fn main() {
         })
         .collect();
 
+    // FIXME: type is unclear
     let benchmarks: Vec<_> = test_descs
         .iter()
         .map(|(name, _)| {
@@ -105,6 +109,7 @@ fn main() {
         })
         .collect();
 
+    // FIXME: type is unclear
     let test_mods = test_descs
         .iter()
         .map(|(name, _)| {
@@ -154,6 +159,7 @@ fn test_root_element(
     client: Client,
     name: String,
     fixture_path: impl AsRef<Path>,
+    // FIXME: Future's type signature appears to have changed
 ) -> impl Future<Item = (String, json::JsonValue), Error = Error> {
     let fixture_path = fixture_path.as_ref();