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`
(cherry picked from commit 8560564657735a4c22004d51db9775ca2f1d9645)

diff --git a/configure.ac b/configure.ac
index 91c798fc0fbf03b4016b08e5b71622e1218b0283..86f40c573da19f0269ebb445fda65abb838b72ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2642,7 +2642,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 d8c32e41fec62b93b8510b4e7f483f9479750e01..70615afaaa0af3b078c7d3e4d8e95d170e76a3e6 100644 (file)
--- 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 665077b3e5fc636b3d2cf9e693097757ae723e8e..db3935af3a86519c01f1588bb5cb9e1c31f4acac 100644 (file)
--- 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