maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/derivation): move comma writing business up

Browse source 
write_input_derivations shouldn't need to write a comma to separate it
from the previous output from write_outputs.
This is better placed in the function calling all of these helper
functions.

Change-Id: I9ccc440e4665b52369ef39e75151b9a29469ce48
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8995
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-07-30 09:37:17 +02:00 • committed by clbot
parent 3f856d8977
commit aa1982c085
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tvix/nix-compat/src/derivation/mod.rs
View file

@ -51,11 +51,23 @@ impl Derivation {
write::write_char(writer, write::PAREN_OPEN)?;
write::write_outputs(writer, &self.outputs)?;
write::write_char(writer, write::COMMA)?;
write::write_input_derivations(writer, &self.input_derivations)?;
write::write_char(writer, write::COMMA)?;
write::write_input_sources(writer, &self.input_sources)?;
write::write_char(writer, write::COMMA)?;
write::write_system(writer, &self.system)?;
write::write_char(writer, write::COMMA)?;
write::write_builder(writer, &self.builder)?;
write::write_char(writer, write::COMMA)?;
write::write_arguments(writer, &self.arguments)?;
write::write_char(writer, write::COMMA)?;
write::write_enviroment(writer, &self.environment)?;
write::write_char(writer, write::PAREN_CLOSE)?;

9
tvix/nix-compat/src/derivation/write.rs
View file

@ -107,7 +107,6 @@ pub fn write_input_derivations(
writer: &mut impl Write,
input_derivations: &BTreeMap<String, BTreeSet<String>>,
) -> Result<(), io::Error> {
write_char(writer, COMMA)?;
write_char(writer, BRACKET_OPEN)?;
for (ii, (input_derivation_path, input_derivation)) in input_derivations.into_iter().enumerate()
@ -142,8 +141,6 @@ pub fn write_input_sources(
writer: &mut impl Write,
input_sources: &BTreeSet<String>,
) -> Result<(), io::Error> {
write_char(writer, COMMA)?;
write_char(writer, BRACKET_OPEN)?;
write_array_elements(
writer,
@ -158,19 +155,16 @@ pub fn write_input_sources(
}
pub fn write_system(writer: &mut impl Write, platform: &str) -> Result<(), Error> {
write_char(writer, COMMA)?;
write_field(writer, platform, true)?;
Ok(())
}
pub fn write_builder(writer: &mut impl Write, builder: &str) -> Result<(), Error> {
write_char(writer, COMMA)?;
write_field(writer, builder, true)?;
Ok(())
}
pub fn write_arguments(writer: &mut impl Write, arguments: &[String]) -> Result<(), io::Error> {
write_char(writer, COMMA)?;
pub fn write_arguments(writer: &mut impl Write, arguments: &[String]) -> Result<(), io::Error> {
write_char(writer, BRACKET_OPEN)?;
write_array_elements(
writer,
@ -188,7 +182,6 @@ pub fn write_enviroment(
writer: &mut impl Write,
environment: &BTreeMap<String, BString>,
) -> Result<(), io::Error> {
write_char(writer, COMMA)?;
write_char(writer, BRACKET_OPEN)?;
for (i, (k, v)) in environment.into_iter().enumerate() {