Remove dev-dependency insta

Author: Veykril

Cargo.lock

@@ -28,6 +28,5 @@ salsa-macros = { version = "0.0.0", path = "salsa-macros" }
 diff = "0.1.13"
 linked-hash-map = "0.5.6"
 rand = "0.8.5"
-rand_distr = "0.4.3"
 test-log = "0.2.14"
-insta = "1.18.0"
+expect-test = "1.4.0"

crates/salsa/Cargo.toml

@@ -1,3 +1,4 @@
+//!
 use heck::ToSnakeCase;
 use proc_macro::TokenStream;
 use syn::parse::{Parse, ParseStream};
@@ -113,10 +114,8 @@ pub(crate) fn database(args: TokenStream, input: TokenStream) -> TokenStream {
     let mut maybe_changed_ops = proc_macro2::TokenStream::new();
     let mut cycle_recovery_strategy_ops = proc_macro2::TokenStream::new();
     let mut for_each_ops = proc_macro2::TokenStream::new();
-    for ((QueryGroup { group_path }, group_storage), group_index) in query_groups
-        .iter()
-        .zip(&query_group_storage_names)
-        .zip(0_u16..)
+    for ((QueryGroup { group_path }, group_storage), group_index) in
+        query_groups.iter().zip(&query_group_storage_names).zip(0_u16..)
     {
         fmt_ops.extend(quote! {
             #group_index => {

crates/salsa/salsa-macros/src/database_storage.rs

@@ -1,3 +1,4 @@
+//!
 pub(crate) struct Parenthesized<T>(pub(crate) T);
 
 impl<T> syn::parse::Parse for Parenthesized<T>

crates/salsa/salsa-macros/src/parenthesized.rs

@@ -1,3 +1,4 @@
+//!
 use std::{convert::TryFrom, iter::FromIterator};
 
 use crate::parenthesized::Parenthesized;
@@ -20,12 +21,9 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
     let input_span = input.span();
     let (trait_attrs, salsa_attrs) = filter_attrs(input.attrs);
     if !salsa_attrs.is_empty() {
-        return Error::new(
-            input_span,
-            format!("unsupported attributes: {:?}", salsa_attrs),
-        )
-        .to_compile_error()
-        .into();
+        return Error::new(input_span, format!("unsupported attributes: {:?}", salsa_attrs))
+            .to_compile_error()
+            .into();
     }
 
     let trait_vis = input.vis;
@@ -43,7 +41,8 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
             let mut cycle = None;
             let mut invoke = None;
 
-            let mut query_type = format_ident!("{}Query", query_name.to_string().to_upper_camel_case());
+            let mut query_type =
+                format_ident!("{}Query", query_name.to_string().to_upper_camel_case());
             let mut num_storages = 0;
 
             // Extract attributes.
@@ -175,9 +174,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
                     fn_name: lookup_fn_name,
                     receiver: self_receiver.clone(),
                     attrs: vec![], // FIXME -- some automatically generated docs on this method?
-                    storage: QueryStorage::InternedLookup {
-                        intern_query_type: query_type.clone(),
-                    },
+                    storage: QueryStorage::InternedLookup { intern_query_type: query_type.clone() },
                     keys: lookup_keys,
                     value: lookup_value,
                     invoke: None,
@@ -211,9 +208,9 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
     let mut storage_fields = proc_macro2::TokenStream::new();
     let mut queries_with_storage = vec![];
     for query in &queries {
-        #[allow(clippy::map_identity)] // clippy is incorrect here, this is not the identity function due to match ergonomics
-        let (key_names, keys): (Vec<_>, Vec<_>) =
-            query.keys.iter().map(|(a, b)| (a, b)).unzip();
+        #[allow(clippy::map_identity)]
+        // clippy is incorrect here, this is not the identity function due to match ergonomics
+        let (key_names, keys): (Vec<_>, Vec<_>) = query.keys.iter().map(|(a, b)| (a, b)).unzip();
         let value = &query.value;
         let fn_name = &query.fn_name;
         let qt = &query.query_type;
@@ -361,11 +358,8 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
         }
     });
 
-    let non_transparent_queries = || {
-        queries
-            .iter()
-            .filter(|q| !matches!(q.storage, QueryStorage::Transparent))
-    };
+    let non_transparent_queries =
+        || queries.iter().filter(|q| !matches!(q.storage, QueryStorage::Transparent));
 
     // Emit the query types.
     for (query, query_index) in non_transparent_queries().zip(0_u16..) {
@@ -681,11 +675,7 @@ impl TryFrom<syn::Attribute> for SalsaAttr {
 }
 
 fn is_not_salsa_attr_path(path: &syn::Path) -> bool {
-    path.segments
-        .first()
-        .map(|s| s.ident != "salsa")
-        .unwrap_or(true)
-        || path.segments.len() != 2
+    path.segments.first().map(|s| s.ident != "salsa").unwrap_or(true) || path.segments.len() != 2
 }
 
 fn filter_attrs(attrs: Vec<Attribute>) -> (Vec<Attribute>, Vec<SalsaAttr>) {