From 7d07aa395a90f33bb939625de8576c0fa667aef7 Mon Sep 17 00:00:00 2001 From: Ethan P Date: Mon, 11 May 2020 19:23:56 -0700 Subject: [PATCH] Change assets.rs tests to use InputKind::CustomReader This should avoid errors in filesystems that don't support UTF-8 or invalid UTF-8. --- src/assets.rs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/assets.rs b/src/assets.rs index 58ac2c08..6cf2e2c4 100644 --- a/src/assets.rs +++ b/src/assets.rs @@ -233,14 +233,12 @@ impl HighlightingAssets { path.canonicalize().ok().unwrap_or_else(|| path.to_owned()); let line_syntax = self.get_first_line_syntax(&mut input.reader); - match mapping.get_syntax_for(path_str) { + match mapping.get_syntax_for(absolute_path) { Some(MappingTarget::MapTo(syntax_name)) => { - println!("Mapped {:?} as {:?}", path_str, syntax_name); self.syntax_set.find_syntax_by_name(syntax_name) } Some(MappingTarget::MapToUnknown) => line_syntax, None => { - println!("Test {:?}", path_str); let file_name = path.file_name().unwrap_or_default(); self.get_extension_syntax(file_name).or(line_syntax) } @@ -281,8 +279,6 @@ mod tests { use super::*; use std::ffi::OsStr; - use std::fs::File; - use std::io::Write; use tempdir::TempDir; @@ -306,12 +302,8 @@ mod tests { fn syntax_for_file_with_content_os(&self, file_name: &OsStr, first_line: &str) -> String { let file_path = self.temp_dir.path().join(file_name); - { - let mut temp_file = File::create(&file_path).unwrap(); - writeln!(temp_file, "{}", first_line).unwrap(); - } - - let input = Input::ordinary_file(file_path.as_os_str()); + let input = Input::from_reader(Box::new(BufReader::new(first_line.as_bytes()))) + .with_name(Some(file_path.as_os_str())); let dummy_stdin: &[u8] = &[]; let mut opened_input = input.open(dummy_stdin).unwrap(); let syntax = self