Bug 1888431 - Port bug 1888321: Rename Rust's .cargo/config.in to config.toml.in. r=dandarnell
Differential Revision: https://phabricator.services.mozilla.com/D206020 --HG-- rename : rust/.cargo/config.in => rust/.cargo/config.toml.in extra : amend_source : 0d9ebc3b9e5775149e58fab8966a7146d759ad0f
This commit is contained in:
Родитель
8911c24ace
Коммит
8e4b06bd9c
|
@ -35,7 +35,7 @@ dependencies.
|
|||
|
||||
Under the hood, this command runs `./mach tb-rust sync` to ensure the
|
||||
workspace's dependencies are up to date, then completely recreates
|
||||
`comm/rust/.cargo/config.in` and `comm/third_party/rust/`.
|
||||
`comm/rust/.cargo/config.toml.in` and `comm/third_party/rust/`.
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
@ -105,7 +105,9 @@ set_config("MOZ_THUNDERBIRD_RUST", True, when="--enable-thunderbird-rust")
|
|||
set_define("MOZ_THUNDERBIRD_RUST", True, when="--enable-thunderbird-rust")
|
||||
set_config("MOZ_OVERRIDE_GKRUST", True, when="--enable-thunderbird-rust")
|
||||
set_config(
|
||||
"MOZ_OVERRIDE_CARGO_CONFIG", "comm/rust/.cargo/config.in", when="--enable-thunderbird-rust"
|
||||
"MOZ_OVERRIDE_CARGO_CONFIG",
|
||||
"comm/rust/.cargo/config.toml.in",
|
||||
when="--enable-thunderbird-rust",
|
||||
)
|
||||
|
||||
include("../../toolkit/moz.configure")
|
||||
|
|
|
@ -18,9 +18,9 @@ from mozbuild.vendor.vendor_rust import VendorRust
|
|||
config_footer = """
|
||||
# Take advantage of the fact that cargo will treat lines starting with #
|
||||
# as comments to add preprocessing directives. This file can thus by copied
|
||||
# as-is to $topsrcdir/.cargo/config with no preprocessing to be used there
|
||||
# as-is to $topsrcdir/.cargo/config.toml with no preprocessing to be used there
|
||||
# (for e.g. independent tasks building rust code), or be preprocessed by
|
||||
# the build system to produce a .cargo/config with the right content.
|
||||
# the build system to produce a .cargo/config.toml with the right content.
|
||||
#define REPLACE_NAME vendored-sources
|
||||
#define VENDORED_DIRECTORY comm/third_party/rust
|
||||
# We explicitly exclude the following section when preprocessing because
|
||||
|
@ -193,7 +193,7 @@ def check_vendored_dependencies(topsrcdir):
|
|||
Checks current checksums of Cargo.toml files against
|
||||
the saved values. Returns a list of mismatched paths.
|
||||
|
||||
:rtype: hlist[str]: List of paths to Cargo.toml files
|
||||
:rtype: List[str]: List of paths to Cargo.toml files
|
||||
"""
|
||||
checksums_file = os.path.join(topsrcdir, "comm", "rust", "checksums.json")
|
||||
try:
|
||||
|
@ -248,7 +248,7 @@ def run_tb_rust_vendor(command_context):
|
|||
|
||||
run_tb_cargo_sync(command_context)
|
||||
workspace = os.path.join(command_context.topsrcdir, "comm", "rust")
|
||||
config = os.path.join(workspace, ".cargo", "config.in")
|
||||
config = os.path.join(workspace, ".cargo", "config.toml.in")
|
||||
third_party = os.path.join(command_context.topsrcdir, "comm", "third_party", "rust")
|
||||
|
||||
if os.path.exists(third_party):
|
||||
|
|
|
@ -114,9 +114,9 @@ replace-with = "vendored-sources"
|
|||
|
||||
# Take advantage of the fact that cargo will treat lines starting with #
|
||||
# as comments to add preprocessing directives. This file can thus by copied
|
||||
# as-is to $topsrcdir/.cargo/config with no preprocessing to be used there
|
||||
# as-is to $topsrcdir/.cargo/config.toml with no preprocessing to be used there
|
||||
# (for e.g. independent tasks building rust code), or be preprocessed by
|
||||
# the build system to produce a .cargo/config with the right content.
|
||||
# the build system to produce a .cargo/config.toml with the right content.
|
||||
#define REPLACE_NAME vendored-sources
|
||||
#define VENDORED_DIRECTORY comm/third_party/rust
|
||||
# We explicitly exclude the following section when preprocessing because
|
|
@ -1,7 +1,7 @@
|
|||
comm/mailnews/extensions/newsblog/test/unit/resources/feeds-missing-timestamp/feeds.json
|
||||
comm/mailnews/extensions/newsblog/test/unit/resources/feeds-simple/feeditems.json
|
||||
comm/mailnews/extensions/newsblog/test/unit/resources/feeds-simple/feeds.json
|
||||
comm/rust/.cargo/config.in
|
||||
comm/rust/.cargo/config.toml.in
|
||||
comm/rust/Cargo.toml
|
||||
comm/rust/Cargo.lock
|
||||
comm/rust/checksums.json
|
||||
|
|
Загрузка…
Ссылка в новой задаче