Remove references to hippotat-macros crate, everywhere

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Cargo.lock b/Cargo.lock
index d3ce140be838ab05cbc451972ec3fbb98674bda0..522f161dd38bdfc46ca8ca997c1a9c66e117c620 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -706,15 +706,6 @@ dependencies = [
  "void",
 ]
 
-[[package]]
-name = "hippotat-macros"
-version = "1.3.3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "hostname"
 version = "0.4.2"

diff --git a/Cargo.lock.minimal b/Cargo.lock.minimal
index 6eb4da59e850eba0bafc8bab7c80c21fec739d4e..c7fe41632dd1a01304dc9c117b6b2cab98722ddf 100644 (file)
--- a/Cargo.lock.minimal
+++ b/Cargo.lock.minimal
@@ -702,15 +702,6 @@ dependencies = [
  "void",
 ]
 
-[[package]]
-name = "hippotat-macros"
-version = "1.3.3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.103",
-]
-
 [[package]]
 name = "hostname"
 version = "0.3.1"

diff --git a/Cargo.toml b/Cargo.toml
index f32fe1ba8ac902f0a57e945d93849609369d0a19..78e09d53b7f68daadffe33547100d9b021f4b67a 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ homepage="https://www.chiark.greenend.org.uk/~ianmdlvl/hippotat/current/docs/"
 rust-version = "1.85"
 
 [workspace]
-members = ["macros"]
+members = []
 
 [[bin]]
 name="hippotat"

diff --git a/Makefile b/Makefile
index 73fdc5f7a660ba0d6d24b47fa335111ceabae950..460e22f8eb1914550b32ced6f1cbd24868bf491e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -109,8 +109,7 @@ very-clean: clean
 # Update release notes in debian/changelog:
 #
 # Update versions
-#   * Cargo.toml               version, hippotat-macros dependency
-#   * macros/Cargo.toml                version
+#   * Cargo.toml               version
 #   * debian/changelog         finalise
 #   * Cargo.lock, Cargo.lock.minimal
 #

diff --git a/debian/control b/debian/control
index cbf1ad893bb9ae625c999854afa884c7af8806eb..2487a773a5121f1845d031f95bdb3324241db6d4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -40,8 +40,6 @@ Build-Depends: debhelper (>= 12),
     librust-nix-dev (>= 0.25~) <!upstream-cargo>,
     librust-parking-lot-dev (>= 0.11~) <!upstream-cargo>,
     librust-pin-project-lite-dev (>= 0.2~) <!upstream-cargo>,
-    librust-proc-macro2-dev (>= 1~) <!upstream-cargo>,
-    librust-quote-dev (>= 1~) <!upstream-cargo>,
     librust-regex-dev (>= 1.5~) <!upstream-cargo>,
     librust-reqwest-dev (>= 0.12.8~) <!upstream-cargo>,
     librust-sd-notify-dev (>= 0.4.1~) <!upstream-cargo>,
@@ -50,7 +48,6 @@ Build-Depends: debhelper (>= 12),
     librust-serde-json-dev (>= 1.0.41~) <!upstream-cargo>,
     librust-sha2-dev (>= 0.10~) <!upstream-cargo>,
     librust-subtle-dev (>= 2~) <!upstream-cargo>,
-    librust-syn-dev (>= 1~) <!upstream-cargo>,
     librust-syslog-dev (>= 6~) <!upstream-cargo>,
     librust-thiserror-dev (>= 1.0.2~) <!upstream-cargo>,
     librust-tokio-dev (>= 1.43~) <!upstream-cargo>,

diff --git a/debian/update-build-deps b/debian/update-build-deps
index 14f31ed7d1d5bb0f21b627785d60629c8f4ccca1..151fa48bb3b979ccd0f3f4b52d72f7a571183101 100755 (executable)
--- a/debian/update-build-deps
+++ b/debian/update-build-deps
@@ -35,7 +35,7 @@ while (<I>) {
     if (m{^\S} && !m{^\#}i) {
       local ($_);
       my %outputs;
-      foreach my $file (qw(Cargo.toml macros/Cargo.toml)) {
+      foreach my $file (qw(Cargo.toml)) {
        open C, $file or die "$file $!";
        my $toml = do { local $/ = undef; <C> // die "$file $!"; };
        C->error and die "$file $!";