From 4543940571d48b83829315165fc009d1736c20d9 Mon Sep 17 00:00:00 2001 From: Scott Schafer Date: Mon, 18 Jul 2022 15:05:23 -0500 Subject: [PATCH] update `as_bytes` to `to_bytes` --- crates/snapbox/src/cmd.rs | 7 +++---- crates/snapbox/src/data.rs | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/crates/snapbox/src/cmd.rs b/crates/snapbox/src/cmd.rs index 88618adb..54494dc0 100644 --- a/crates/snapbox/src/cmd.rs +++ b/crates/snapbox/src/cmd.rs @@ -325,7 +325,7 @@ impl Command { // before we read. Here we do this by dropping the Command object. drop(self.cmd); - let (stdout, stderr) = process_io(&mut child, self.stdin.as_ref().map(|d| d.as_bytes()))?; + let (stdout, stderr) = process_io(&mut child, self.stdin.as_ref().map(|d| d.to_bytes()))?; let status = wait(child, self.timeout)?; let _stdout = stdout @@ -350,7 +350,7 @@ impl Command { self.cmd.stderr(std::process::Stdio::piped()); let mut child = self.cmd.spawn()?; - let (stdout, stderr) = process_io(&mut child, self.stdin.as_ref().map(|d| d.as_bytes()))?; + let (stdout, stderr) = process_io(&mut child, self.stdin.as_ref().map(|d| d.to_bytes()))?; let status = wait(child, self.timeout)?; let stdout = stdout @@ -370,11 +370,10 @@ impl Command { fn process_io( child: &mut std::process::Child, - input: Option<&[u8]>, + input: Option>, ) -> std::io::Result<(Stream, Stream)> { use std::io::Write; - let input = input.map(|b| b.to_owned()); let stdin = input.and_then(|i| { child .stdin diff --git a/crates/snapbox/src/data.rs b/crates/snapbox/src/data.rs index 96b46a19..fe00ca21 100644 --- a/crates/snapbox/src/data.rs +++ b/crates/snapbox/src/data.rs @@ -72,7 +72,7 @@ impl Data { format!("Failed to create parent dir for {}: {}", path.display(), e) })?; } - std::fs::write(path, self.as_bytes()) + std::fs::write(path, self.to_bytes()) .map_err(|e| format!("Failed to write {}: {}", path.display(), e).into()) } @@ -139,10 +139,10 @@ impl Data { } } - pub fn as_bytes(&self) -> &[u8] { + pub fn to_bytes(&self) -> Vec { match &self.inner { - DataInner::Binary(data) => data, - DataInner::Text(data) => data.as_bytes(), + DataInner::Binary(data) => data.clone(), + DataInner::Text(data) => data.clone().into_bytes(), } } }