Fixing a conflict

pmeunier

Feb 17, 2026, 9:18 PM

Z75Y46U5IA4PKK7P4SCP3LKCR6DIDI3R5E2MXL27CMCGRYUFJ2KAC

Dependencies

• [2] ODUDDQRY Adding the OCaml interface
• [3] 7Q4257EP Formatting, cleanup and Rust 2021 compatibility
• [4] BQ4E3XLA Forwarding stdout/stderr
• [5] YJYXDY6A Capturing stdout/stderr for the derivations that ask
• [6] LIMIMBOU Bootstrapping the Rust part

Change contents

• replacement in src/container.rs at line 1
  [2.44692]→[3.164:206](∅→∅)
  − use crate::{find_files::*, mount, Error};
  [2.44692]

  [2.44735]
  + use crate::{Error, find_files::*, mount};
• edit in src/container.rs at line 674
  [4.6456]

  [2.60977]
  + if libc::dup2(stdout_w, this_stdout) < 0 {

  + return Err(std::io::Error::last_os_error().into());

  + }

  + if libc::dup2(stderr_w, this_stderr) < 0 {

  + return Err(std::io::Error::last_os_error().into());

  + }

  +
• edit in src/container.rs at line 754
  [4.6456]→[6.15121:15176](∅→∅),[6.15176]→[5.520:602](∅→∅),[5.520]→[5.520:602](∅→∅),[5.602]→[6.15177:15232](∅→∅),[6.15232]→[5.655:737](∅→∅),[5.655]→[5.655:737](∅→∅)
  − if libc::dup2(stdout_w, this_stdout) < 0 {

  − return Err(std::io::Error::last_os_error().into());

  − }

  − if libc::dup2(stderr_w, this_stderr) < 0 {

  − return Err(std::io::Error::last_os_error().into());

  − }
• resolve order conflict in src/container.rs at line 754
  [2.63152]