From abd539ddb8778a19f32d8ed7e030a28670e1c580 Mon Sep 17 00:00:00 2001 From: Jürgen Hahn Date: Wed, 4 Jan 2023 12:26:37 +0100 Subject: feat(tvix/derivation) Add fmt::Display implementation for Derivation This adds the implementation of fmt::Display for Derivation so that we can easily store the formatted content as a string. Internally, we use the serialization function to generate the string. Change-Id: I6caca0d6c1bea3ca44b6c535c5b1d5d66d8413b7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7741 Reviewed-by: flokli Tested-by: BuildkiteCI --- tvix/derivation/src/derivation.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'tvix/derivation/src/derivation.rs') diff --git a/tvix/derivation/src/derivation.rs b/tvix/derivation/src/derivation.rs index 142fa3c9f309..406d2e0a5787 100644 --- a/tvix/derivation/src/derivation.rs +++ b/tvix/derivation/src/derivation.rs @@ -15,20 +15,26 @@ pub struct Derivation { } impl Derivation { - pub fn serialize(self: Self, writer: &mut impl Write) -> Result<(), fmt::Error> { + pub fn serialize(&self, writer: &mut impl Write) -> Result<(), fmt::Error> { writer.write_str(write::DERIVATION_PREFIX)?; writer.write_char(write::PAREN_OPEN)?; - write::write_outputs(writer, self.outputs)?; - write::write_input_derivations(writer, self.input_derivations)?; - write::write_input_sources(writer, self.input_sources)?; + write::write_outputs(writer, &self.outputs)?; + write::write_input_derivations(writer, &self.input_derivations)?; + write::write_input_sources(writer, &self.input_sources)?; write::write_platfrom(writer, &self.platform)?; write::write_builder(writer, &self.builder)?; - write::write_arguments(writer, self.arguments)?; - write::write_enviroment(writer, self.environment)?; + write::write_arguments(writer, &self.arguments)?; + write::write_enviroment(writer, &self.environment)?; writer.write_char(write::PAREN_CLOSE)?; Ok(()) } } + +impl fmt::Display for Derivation { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + self.serialize(f) + } +} -- cgit 1.4.1