Skip to content

Commit eca6f6f

Browse files
authored
install-build-deps: --rust-toolchain -> --rust (#3650)
1 parent 6ccb0cf commit eca6f6f

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

python/tools/code_format_rust.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self):
3030
def run_formatter(self, repo_root: str, check_only: bool, files: list[str]):
3131
tool = '.cargo/bin/rustfmt'
3232
if not os.path.exists(tool):
33-
err = f'Cannot find {tool}\nRun tools/install-build-deps --rust-toolchain'
33+
err = f'Cannot find {tool}\nRun tools/install-build-deps --rust'
3434
print(err, file=sys.stderr)
3535
return 127
3636
cmd = [tool, '--edition', '2024', '--unstable-features', '--skip-children']

tools/install-build-deps

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -862,9 +862,7 @@ def Main():
862862
choices=['arm64', 'x64'],
863863
help='Override the autodetected build CPU architecture')
864864
parser.add_argument(
865-
'--rust-toolchain',
866-
action='store_true',
867-
help='Rust toolchain to build Rust SDK')
865+
'--rust', action='store_true', help='Rust toolchain to build Rust SDK')
868866
args = parser.parse_args()
869867
if args.verify:
870868
CheckHashes()
@@ -896,7 +894,7 @@ def Main():
896894
# TODO(b/360084012) Change the arg name to bigtrace
897895
if args.grpc:
898896
deps += BIGTRACE_DEPS
899-
if args.rust_toolchain:
897+
if args.rust:
900898
deps += BUILD_DEPS_RUST
901899
deps_updated = False
902900
nodejs_updated = False
@@ -1006,7 +1004,7 @@ def Main():
10061004
elif venv_needs_update:
10071005
InstallPythonVenv()
10081006

1009-
if args.rust_toolchain:
1007+
if args.rust:
10101008
if args.check_only:
10111009
deps_updated |= not CheckRustToolchain()
10121010
else:

0 commit comments

Comments
 (0)