diff options
author | Florian Klink <flokli@flokli.de> | 2024-04-22T20·16+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-04-22T20·28+0000 |
commit | ff9e8743f6572bc44c084e49adc13bf293016295 (patch) | |
tree | 09c8d34db2c80ab8a4df57f7dd031307397b1404 /tvix/eval/src/value/string.rs | |
parent | 6d79cf39b9b9a2d250e1a94ac6f36921cea298ee (diff) |
fix(tvix/eval): don't impl From<NixString> for String r/7991
This caught me by accident in an earlier revision of cl/11500 - I had a `NixString`, wanted to return it as a `String`, so I was naively calling `s.into()`. That unfortunately gave me the `Display` implementation of `NixString`, which quotes strings, causing an annoying error further up the stack. NixStrings are bytes, we can keep the impl From<NixString> for BString, but having a `.into()` suddenly do quoting is more than unexpected. Change-Id: I5434ba94bfe6c493d0a57e68225ecc22daa4b948 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11505 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/value/string.rs')
-rw-r--r-- | tvix/eval/src/value/string.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tvix/eval/src/value/string.rs b/tvix/eval/src/value/string.rs index dd027895fd1c..ceb43f1ea5ed 100644 --- a/tvix/eval/src/value/string.rs +++ b/tvix/eval/src/value/string.rs @@ -530,11 +530,7 @@ impl<'a> From<&'a NixString> for &'a BStr { } } -impl From<NixString> for String { - fn from(s: NixString) -> Self { - s.to_string() - } -} +// No impl From<NixString> for String, that one quotes. impl From<NixString> for BString { fn from(s: NixString) -> Self { |