dev-vcs/pre-commit: drop dependency on dev-python/toml

Backported to 2.20.0 from upstream Git master branch.

Bug: https://bugs.gentoo.org/878677
Signed-off-by: Marek Szuba <marecki@gentoo.org>

1 files changed, 81 insertions, 0 deletions

diff --git a/dev-vcs/pre-commit/files/pre-commit-2.20.0-no_toml.patch b/dev-vcs/pre-commit/files/pre-commit-2.20.0-no_toml.patch
new file mode 100644
index 000000000000..f7f335c29e14
--- /dev/null
+++ b/dev-vcs/pre-commit/files/pre-commit-2.20.0-no_toml.patch
@@ -0,0 +1,81 @@
+Backported upstream commit e703982de45ac64492897b25fa4edbdb8da10e62.
+
+--- a/pre_commit/languages/rust.py
++++ b/pre_commit/languages/rust.py
+@@ -5,8 +5,6 @@
+ from typing import Generator
+ from typing import Sequence
+ 
+-import toml
+-
+ import pre_commit.constants as C
+ from pre_commit.envcontext import envcontext
+ from pre_commit.envcontext import PatchesT
+@@ -38,18 +36,16 @@
+ 
+ 
+ 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_environment(
+@@ -77,9 +73,6 @@
+     }
+     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:
+@@ -90,6 +83,9 @@
+             else:
+                 packages_to_install.add((package,))
+ 
++        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,
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -27,7 +27,6 @@
+     identify>=1.0.0
+     nodeenv>=0.11.1
+     pyyaml>=5.1
+-    toml
+     virtualenv>=20.0.8
+     importlib-metadata;python_version<"3.8"
+ python_requires = >=3.7
+--- a/tests/repository_test.py
++++ b/tests/repository_test.py
+@@ -485,7 +485,7 @@
+     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(