Sitelet https://github.com/pre-commit/pre-commit/pull/2568/files
Skip to content

Change Rust to install environment with cargo add over toml #2568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asottile merged 1 commit into from
Oct 29, 2022
Merged

Change Rust to install environment with cargo add over toml #2568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions pre_commit/languages/rust.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
from typing import Generator
from typing import Sequence

import toml

import pre_commit.constants as C
from pre_commit import parse_shebang
from pre_commit.envcontext import envcontext
Expand Down Expand Up @@ -82,18 +80,16 @@ def in_env(


def _add_dependencies(
cargo_toml_path: str,
prefix: Prefix,
additional_dependencies: set[str],
) -> None:
with open(cargo_toml_path, 'r+') as f:
cargo_toml = toml.load(f)
cargo_toml.setdefault('dependencies', {})
for dep in additional_dependencies:
name, _, spec = dep.partition(':')
cargo_toml['dependencies'][name] = spec or '*'
f.seek(0)
toml.dump(cargo_toml, f)
f.truncate()
crates = []
for dep in additional_dependencies:
name, _, spec = dep.partition(':')
crate = f'{name}@{spec or "*"}'
crates.append(crate)

helpers.run_setup_cmd(prefix, ('cargo', 'add', *crates))


def install_rust_with_toolchain(toolchain: str) -> None:
Expand Down Expand Up @@ -151,9 +147,6 @@ def install_environment(
}
lib_deps = set(additional_dependencies) - cli_deps

if len(lib_deps) > 0:
_add_dependencies(prefix.path('Cargo.toml'), lib_deps)

with clean_path_on_failure(directory):
packages_to_install: set[tuple[str, ...]] = {('--path', '.')}
for cli_dep in cli_deps:
Expand All @@ -168,6 +161,9 @@ def install_environment(
if version != 'system':
install_rust_with_toolchain(_rust_toolchain(version))

if len(lib_deps) > 0:
_add_dependencies(prefix, lib_deps)

for args in packages_to_install:
cmd_output_b(
'cargo', 'install', '--bins', '--root', directory, *args,
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ install_requires =
identify>=1.0.0
nodeenv>=0.11.1
pyyaml>=5.1
toml
virtualenv>=20.10.0
importlib-metadata;python_version<"3.8"
python_requires = >=3.7
Expand Down
2 changes: 1 addition & 1 deletion tests/repository_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ def test_additional_rust_lib_dependencies_installed(
path = make_repo(tempdir_factory, 'rust_hooks_repo')
config = make_config_from_repo(path)
# A small rust package with no dependencies.
deps = ['shellharden:3.1.0']
deps = ['shellharden:3.1.0', 'git-version']
config['hooks'][0]['additional_dependencies'] = deps
hook = _get_hook(config, store, 'rust-hook')
binaries = os.listdir(
Expand Down