From 8560564657735a4c22004d51db9775ca2f1d9645 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Thu, 16 May 2024 10:42:53 -0600 Subject: [PATCH] rust: rename .cargo/config to .cargo/config.toml Addresses this warning from the Rust compiler: warning: `../rust/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` --- configure.ac | 2 +- rust/.cargo/{config.in => config.toml.in} | 0 rust/.gitignore | 3 ++- rust/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename rust/.cargo/{config.in => config.toml.in} (100%) diff --git a/configure.ac b/configure.ac index 0e9390bb88..de8fd2687d 100644 --- a/configure.ac +++ b/configure.ac @@ -2643,7 +2643,7 @@ AC_SUBST(enable_non_bundled_htp) AM_CONDITIONAL([BUILD_SHARED_LIBRARY], [test "x$enable_shared" = "xyes"] && [test "x$can_build_shared_library" = "xyes"]) -AC_CONFIG_FILES(Makefile src/Makefile rust/Makefile rust/Cargo.lock rust/Cargo.toml rust/derive/Cargo.toml rust/.cargo/config) +AC_CONFIG_FILES(Makefile src/Makefile rust/Makefile rust/Cargo.lock rust/Cargo.toml rust/derive/Cargo.toml rust/.cargo/config.toml) AC_CONFIG_FILES(qa/Makefile qa/coccinelle/Makefile) AC_CONFIG_FILES(rules/Makefile doc/Makefile doc/userguide/Makefile) AC_CONFIG_FILES(contrib/Makefile contrib/file_processor/Makefile contrib/file_processor/Action/Makefile contrib/file_processor/Processor/Makefile) diff --git a/rust/.cargo/config.in b/rust/.cargo/config.toml.in similarity index 100% rename from rust/.cargo/config.in rename to rust/.cargo/config.toml.in diff --git a/rust/.gitignore b/rust/.gitignore index d8c32e41fe..70615afaaa 100644 --- a/rust/.gitignore +++ b/rust/.gitignore @@ -1,7 +1,8 @@ !Cargo.toml.in !Cargo.lock.in Cargo.toml -/.cargo/config +/.cargo/config.toml +!/.cargo/config.toml.in /Cargo.lock /target /vendor diff --git a/rust/Makefile.am b/rust/Makefile.am index 4b04a71a90..29cb05577a 100644 --- a/rust/Makefile.am +++ b/rust/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST = src derive \ - .cargo/config.in \ + .cargo/config.toml.in \ cbindgen.toml \ dist/rust-bindings.h \ vendor \ -- 2.47.2