read to String directly without extra conversion

onur-ozkan · onur-ozkan · commit 3865e00c5020 · 2024-12-28T11:33:06.000+03:00
Signed-off-by: onur-ozkan &lt;work@onurozkan.dev&gt;
diff --git a/src/bootstrap/src/core/download.rs b/src/bootstrap/src/core/download.rs
@@ -197,8 +197,7 @@ impl Config {
         if !path_is_dylib(fname) {
             // Finally, set the correct .interp for binaries
             let dynamic_linker_path = nix_deps_dir.join("nix-support/dynamic-linker");
-            // FIXME: can we support utf8 here? `args` doesn't accept Vec<u8>, only OsString ...
-            let dynamic_linker = t!(String::from_utf8(t!(fs::read(dynamic_linker_path))));
+            let dynamic_linker = t!(fs::read_to_string(dynamic_linker_path));
             patchelf.args(["--set-interpreter", dynamic_linker.trim_end()]);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,7 @@ impl Config {`
`197`	`197`	`if !path_is_dylib(fname) {`
`198`	`198`	`// Finally, set the correct .interp for binaries`
`199`	`199`	`let dynamic_linker_path = nix_deps_dir.join("nix-support/dynamic-linker");`
`200`		- // FIXME: can we support utf8 here? `args` doesn't accept Vec<u8>, only OsString ...
`201`		`- let dynamic_linker = t!(String::from_utf8(t!(fs::read(dynamic_linker_path))));`
	`200`	`+ let dynamic_linker = t!(fs::read_to_string(dynamic_linker_path));`
`202`	`201`	`patchelf.args(["--set-interpreter", dynamic_linker.trim_end()]);`
`203`	`202`	`}`
`204`	`203`