diff --git a/src/gamelog.rs b/src/gamelog.rs index 08659bc..83fa3f9 100644 --- a/src/gamelog.rs +++ b/src/gamelog.rs @@ -1,4 +1,3 @@ -use ron::de::{SpannedError, from_reader}; use serde::Deserialize; use std::{fmt, fs::File}; @@ -6,10 +5,10 @@ use std::{fmt, fs::File}; pub struct LogFile(Vec); impl TryFrom for LogFile { - type Error = SpannedError; + type Error = ron::de::SpannedError; fn try_from(file: File) -> Result { - from_reader(file) + ron::de::from_reader(file) } } diff --git a/src/main.rs b/src/main.rs index fec82e1..4b980bb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,7 @@ mod gamelog; use clap::Parser; use gamelog::LogFile; -use std::{fs::OpenOptions, path::PathBuf}; +use std::path::PathBuf; #[derive(Debug, Parser)] struct Args { @@ -23,8 +23,8 @@ fn main() { let config = Args::parse(); let log: LogFile = LogFile::try_from( - match OpenOptions::new() // Defaults to setting all options false. - .read(true) + match std::fs::OpenOptions::new() // Defaults to setting all options false. + .read(true) // Only need ensure that reading is possible. .open(&config.logfile_path.as_path()) { Ok(f) => f,