other fixes

Manishearth · Oct 18, 2024 · 5d78869 · 5d78869
1 parent 254abe5
commit 5d78869
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/runtest.rs b/src/runtest.rs
@@ -1940,9 +1940,7 @@ actual:\n\
 
     fn charset() -> &'static str {
         // FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset
-        if cfg!(target_os = "bitrig") {
-            "auto"
-        } else if cfg!(target_os = "freebsd") {
+        if cfg!(target_os = "freebsd") {
             "ISO-8859-1"
         } else {
             "UTF-8"
@@ -3143,7 +3141,7 @@ fn read2_abbreviated(mut child: Child) -> io::Result<Output> {
         child.stdout.take().unwrap(),
         child.stderr.take().unwrap(),
         &mut |is_stdout, data, _| {
-            if is_stdout { &mut stdout } else { &mut stderr }.extend(data);
+            if is_stdout { &mut stdout } else { &mut stderr }.extend(&data);
             data.clear();
         },
     )?;