From 2ca05ddc4a1d1a310954b12db6a3b25d92670a3e Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 15 Aug 2023 07:07:44 -0700 Subject: [PATCH] Modernize name of Cargo configuration files (.cargo/config -> .cargo/config.toml) Summary: `.cargo/config.toml` is the modern, editor-friendly name preferred since Rust 1.39. See https://doc.rust-lang.org/1.71.0/cargo/reference/config.html. Reviewed By: shayne-fletcher Differential Revision: D48341886 fbshipit-source-id: dc4390f2b6a974e113e1d4e01d3a3b287a05e785 --- build/fbcode_builder/getdeps/manifest.py | 2 +- build/fbcode_builder/manifests/fb303 | 2 +- build/fbcode_builder/manifests/fbthrift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 7ef984b33..15f69af7d 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -74,7 +74,7 @@ "build_doc": OPTIONAL, "workspace_dir": OPTIONAL, "manifests_to_build": OPTIONAL, - # Where to write cargo config (defaults to build_dir/.cargo/config) + # Where to write cargo config (defaults to build_dir/.cargo/config.toml) "cargo_config_file": OPTIONAL, }, }, diff --git a/build/fbcode_builder/manifests/fb303 b/build/fbcode_builder/manifests/fb303 index 86ba61ffd..ad398a8c2 100644 --- a/build/fbcode_builder/manifests/fb303 +++ b/build/fbcode_builder/manifests/fb303 @@ -8,7 +8,7 @@ shipit_fbcode_builder = true repo_url = https://github.com/facebook/fb303.git [cargo] -cargo_config_file = source/fb303/thrift/.cargo/config +cargo_config_file = source/fb303/thrift/.cargo/config.toml [crate.pathmap] fb303_core = fb303/thrift diff --git a/build/fbcode_builder/manifests/fbthrift b/build/fbcode_builder/manifests/fbthrift index 6b761f127..3d852d8d1 100644 --- a/build/fbcode_builder/manifests/fbthrift +++ b/build/fbcode_builder/manifests/fbthrift @@ -8,7 +8,7 @@ shipit_fbcode_builder = true repo_url = https://github.com/facebook/fbthrift.git [cargo] -cargo_config_file = source/thrift/lib/rust/.cargo/config +cargo_config_file = source/thrift/lib/rust/.cargo/config.toml [crate.pathmap] fbthrift = thrift/lib/rust