diff options
| author | Florian Klink <flokli@flokli.de> | 2024-10-15T23·51+0300 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2024-11-12T11·55+0000 |
| commit | 1428ea4e191aa897a0a23e2c90f997f0b65aae6d (patch) | |
| tree | 6a093f91b2deff805bf08715edced90d490716d4 /tvix/nix-compat/src/derivation/parser.rs | |
| parent | 14744713276870cf0380e31bee01124e1a2f4cb0 (diff) | |
refactor(nix-compat/store_path): use AsRef<str> r/8913
Implement PartialEq/Eq ourselves instead of deriving, by proxying to name.as_ref() (and digest of course). Also implement Hash on our own, clippy doesn't like this to be derived, while Eq/PartialEq is not. Change-Id: Idbe289a23ba3bc8dabf893d4d8752792ae2778c3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12744 Tested-by: BuildkiteCI Reviewed-by: edef <edef@edef.eu> Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/nix-compat/src/derivation/parser.rs')
| -rw-r--r-- | tvix/nix-compat/src/derivation/parser.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tvix/nix-compat/src/derivation/parser.rs b/tvix/nix-compat/src/derivation/parser.rs index 8e9804157da3..a94ed2281a86 100644 --- a/tvix/nix-compat/src/derivation/parser.rs +++ b/tvix/nix-compat/src/derivation/parser.rs @@ -203,11 +203,7 @@ fn string_to_store_path<'a, 'i, S>( path_str: &'a str, ) -> Result<StorePath<S>, nom::Err<NomError<&'i [u8]>>> where - S: std::cmp::Eq - + std::fmt::Display - + std::clone::Clone - + std::ops::Deref<Target = str> - + std::convert::From<&'a str>, + S: std::clone::Clone + AsRef<str> + std::convert::From<&'a str>, { let path = StorePath::from_absolute_path(path_str.as_bytes()).map_err(|e: store_path::Error| { |