third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-17 08:14:42 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3201 from pre-commit/rust-default-language-version

Browse source 
determine rust default language version independent of rust-toolchain.toml
This commit is contained in:
Anthony Sottile 2024-05-10 21:21:22 -04:00 • committed by GitHub
commit eeac061b31
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pre_commit/languages/rust.py
View file

@ -34,7 +34,7 @@ def get_default_version() -> str:
# Just detecting the executable does not suffice, because if rustup is # Just detecting the executable does not suffice, because if rustup is
# installed but no toolchain is available, then `cargo` exists but # installed but no toolchain is available, then `cargo` exists but
# cannot be used without installing a toolchain first. # cannot be used without installing a toolchain first.
if cmd_output_b('cargo', '--version', check=False)[0] == 0: if cmd_output_b('cargo', '--version', check=False, cwd='/')[0] == 0:
return 'system' return 'system'
else: else:
return C.DEFAULT return C.DEFAULT

9
tests/languages/rust_test.py
View file

@ -9,6 +9,7 @@ from pre_commit import parse_shebang
from pre_commit.languages import rust from pre_commit.languages import rust
from pre_commit.store import _make_local_repo from pre_commit.store import _make_local_repo
from testing.language_helpers import run_language from testing.language_helpers import run_language
from testing.util import cwd
ACTUAL_GET_DEFAULT_VERSION = rust.get_default_version.__wrapped__ ACTUAL_GET_DEFAULT_VERSION = rust.get_default_version.__wrapped__
@ -29,6 +30,14 @@ def test_uses_default_when_rust_is_not_available(cmd_output_b_mck):
assert ACTUAL_GET_DEFAULT_VERSION() == C.DEFAULT assert ACTUAL_GET_DEFAULT_VERSION() == C.DEFAULT
def test_selects_system_even_if_rust_toolchain_toml(tmp_path):
toolchain_toml = '[toolchain]\nchannel = "wtf"\n'
tmp_path.joinpath('rust-toolchain.toml').write_text(toolchain_toml)
with cwd(tmp_path):
assert ACTUAL_GET_DEFAULT_VERSION() == 'system'
def _make_hello_world(tmp_path): def _make_hello_world(tmp_path):
src_dir = tmp_path.joinpath('src') src_dir = tmp_path.joinpath('src')
src_dir.mkdir() src_dir.mkdir()