refactor(tests): get rid of function_name

Cargo.toml

@@ -72,6 +72,5 @@ hyper = { version = "0.14", features = ["client", "tcp", "http1", "stream", "ser
 serde_bytes = "0.11.4"
 serde_repr = "0.1.7"
 uuid = { version = "1", features = ["v4"] }
-function_name = "0.3"
 time = { version = "0.3.17", features = ["macros", "rand"] }
 rand = "0.8.5"

tests/it/compression.rs

@@ -42,23 +42,20 @@ async fn check(client: Client) {
     assert_eq!(sum_len, 600_000);
 }
 
-#[crate::named]
 #[tokio::test]
 async fn none() {
     let client = prepare_database!().with_compression(Compression::None);
     check(client).await;
 }
 
 #[cfg(feature = "lz4")]
-#[crate::named]
 #[tokio::test]
 async fn lz4() {
     let client = prepare_database!().with_compression(Compression::Lz4);
     check(client).await;
 }
 
 #[cfg(feature = "lz4")]
-#[crate::named]
 #[tokio::test]
 async fn lz4_hc() {
     let client = prepare_database!().with_compression(Compression::Lz4Hc(4));

tests/it/cursor_error.rs

@@ -1,13 +1,11 @@
 use clickhouse::{Client, Compression};
 
-#[crate::named]
 #[tokio::test]
 async fn deferred() {
     let client = prepare_database!();
     max_execution_time(client, false).await;
 }
 
-#[crate::named]
 #[tokio::test]
 async fn wait_end_of_query() {
     let client = prepare_database!();
@@ -46,7 +44,6 @@ async fn max_execution_time(mut client: Client, wait_end_of_query: bool) {
 }
 
 #[cfg(feature = "lz4")]
-#[crate::named]
 #[tokio::test]
 async fn deferred_lz4() {
     let client = prepare_database!().with_compression(Compression::Lz4);

tests/it/ip.rs

@@ -4,7 +4,6 @@ use serde::{Deserialize, Serialize};
 
 use clickhouse::Row;
 
-#[crate::named]
 #[tokio::test]
 async fn smoke() {
     let client = prepare_database!();

tests/it/main.rs

@@ -1,9 +1,15 @@
 use clickhouse::{sql, Client};
-use function_name::named;
 
 macro_rules! prepare_database {
     () => {
-        crate::_priv::prepare_database(file!(), function_name!()).await
+        crate::_priv::prepare_database({
+            fn f() {}
+            fn type_name_of_val<T>(_: T) -> &'static str {
+                std::any::type_name::<T>()
+            }
+            type_name_of_val(f)
+        })
+        .await
     };
 }
 
@@ -21,8 +27,8 @@ const HOST: &str = "localhost:8123";
 mod _priv {
     use super::*;
 
-    pub(crate) async fn prepare_database(file_path: &str, fn_name: &str) -> Client {
-        let name = make_db_name(file_path, fn_name);
+    pub(crate) async fn prepare_database(fn_path: &str) -> Client {
+        let name = make_db_name(fn_path);
         let client = Client::default().with_url(format!("http://{HOST}"));
 
         client
@@ -42,9 +48,12 @@ mod _priv {
         client.with_database(name)
     }
 
-    fn make_db_name(file_path: &str, fn_name: &str) -> String {
-        let (_, basename) = file_path.rsplit_once('/').expect("invalid file's path");
-        let prefix = basename.strip_suffix(".rs").expect("invalid file's path");
-        format!("{prefix}__{fn_name}")
+    // `it::compression::lz4::{{closure}}::f` -> `chrs__compression__lz4`
+    fn make_db_name(fn_path: &str) -> String {
+        assert!(fn_path.starts_with("it::"));
+        let mut iter = fn_path.split("::").skip(1);
+        let module = iter.next().unwrap();
+        let test = iter.next().unwrap();
+        format!("chrs__{module}__{test}")
     }
 }

tests/it/nested.rs

@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 
 use clickhouse::Row;
 
-#[crate::named]
 #[tokio::test]
 async fn smoke() {
     let client = prepare_database!();

tests/it/query.rs

@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 
 use clickhouse::{error::Error, Row};
 
-#[crate::named]
 #[tokio::test]
 async fn smoke() {
     let client = prepare_database!();
@@ -52,7 +51,6 @@ async fn smoke() {
     }
 }
 
-#[crate::named]
 #[tokio::test]
 async fn fetch_one_and_optional() {
     let client = prepare_database!();
@@ -88,7 +86,6 @@ async fn fetch_one_and_optional() {
 }
 
 // See #19.
-#[crate::named]
 #[tokio::test]
 async fn long_query() {
     let client = prepare_database!();
@@ -112,7 +109,6 @@ async fn long_query() {
 }
 
 // See #22.
-#[crate::named]
 #[tokio::test]
 async fn big_borrowed_str() {
     let client = prepare_database!();
@@ -151,7 +147,6 @@ async fn big_borrowed_str() {
 }
 
 // See #31.
-#[crate::named]
 #[tokio::test]
 async fn all_floats() {
     let client = prepare_database!();

tests/it/time.rs

@@ -8,7 +8,6 @@ use time::{macros::datetime, Date, OffsetDateTime};
 
 use clickhouse::Row;
 
-#[crate::named]
 #[tokio::test]
 async fn datetime() {
     let client = prepare_database!();
@@ -114,7 +113,6 @@ async fn datetime() {
     assert_eq!(row_str.dt64ns, &original_row.dt64ns.to_string()[..29]);
 }
 
-#[crate::named]
 #[tokio::test]
 async fn date() {
     let client = prepare_database!();
@@ -168,7 +166,6 @@ async fn date() {
     }
 }
 
-#[crate::named]
 #[tokio::test]
 async fn date32() {
     let client = prepare_database!();

tests/it/uuid.rs

@@ -5,7 +5,6 @@ use uuid::Uuid;
 
 use clickhouse::Row;
 
-#[crate::named]
 #[tokio::test]
 async fn smoke() {
     let client = prepare_database!();

tests/it/watch.rs

@@ -31,7 +31,6 @@ async fn insert_into_table(client: &Client, rows: &[MyRow]) {
     insert.end().await.unwrap();
 }
 
-#[crate::named]
 #[tokio::test]
 async fn changes() {
     let client = prepare_database!();
@@ -69,7 +68,6 @@ async fn changes() {
     assert_eq!(cursor2.next().await.unwrap(), Some((3, MyRow { num: 21 })));
 }
 
-#[crate::named]
 #[tokio::test]
 async fn events() {
     let client = prepare_database!();