From e3bbe3385ae344797e53410d8dcf34d8e626ca2a Mon Sep 17 00:00:00 2001 From: Conor Schaefer Date: Wed, 6 Sep 2023 10:13:45 -0700 Subject: [PATCH] build: set resolver=1 for workspace Our cargo actions were emitting a warning: warning: some crates are on edition 2021 which defaults to `resolver = "2"`, but virtual workspaces default to `resolver = "1"` note: to keep the current resolver, specify `workspace.resolver = "1"` in the workspace root's manifest note: to use the edition 2021 resolver, specify `workspace.resolver = "2"` in the workspace root's manifest Updating the workspace's Cargo.toml to force use of resolver v1 for the workspace. Setting v2 broke the "rust-docs" script, so hardcoding the current behavior to eliminate warnings. See related docs: https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index b3a4704178..20928888d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,8 @@ [workspace] +# Set virtual workspace's resolver to v1, to support the "rust-docs" script. +resolver = "1" + exclude = [ "tools/proto-compiler", "tools/parameter-setup",