From 0356b707e99910a2896f48dfba29894ffa206b25 Mon Sep 17 00:00:00 2001 From: syn Date: Tue, 14 Jan 2020 00:03:40 +0300 Subject: Some more refactoring --- src/backends/mod.rs | 2 +- src/backends/python.rs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/backends/mod.rs b/src/backends/mod.rs index b013298..f24a162 100644 --- a/src/backends/mod.rs +++ b/src/backends/mod.rs @@ -11,7 +11,7 @@ pub trait Backend { fn run(&self, fname: &Path) -> std::io::Result<()>; - fn try_guess_test(&self, fname: &Path) -> Option { + fn try_guess_test_file(&self, fname: &Path) -> Option { let maybe_test = fname.with_extension("txt"); if maybe_test.exists() { return Some(maybe_test); diff --git a/src/backends/python.rs b/src/backends/python.rs index 2776eb2..0b081b9 100644 --- a/src/backends/python.rs +++ b/src/backends/python.rs @@ -2,8 +2,9 @@ use serde_derive::{ Serialize, Deserialize }; use crate::backends::Backend; use std::process::{ Command, Stdio }; use std::path::Path; -use log::trace; use std::io::{ Error, ErrorKind }; +use std::fs::File; +use log::trace; #[derive(Debug, Serialize, Deserialize, Default)] pub struct PythonBackend { @@ -21,8 +22,8 @@ impl Backend for PythonBackend { fn run(&self, fname: &Path) -> std::io::Result<()> { let interpreter = format!("python{}", self.version.as_ref().unwrap_or(&String::new())); - let stdio = match self.try_guess_test(fname) { - Some(test_file) => Stdio::from(std::fs::File::open(test_file)?), + let stdio = match self.try_guess_test_file(fname) { + Some(test_file) => Stdio::from(File::open(test_file)?), None => Stdio::piped() }; let timer = std::time::SystemTime::now(); -- cgit v1.2.1-18-gbd029