@@ -246,7 +246,7 @@ mod tests {
246246 }
247247 }
248248
249− fn syntax_name_with_content(&self, file_name: &str, first_line: &str) -> String {
249+ fn synax_for_file_with_content(&self, file_name: &str, first_line: &str) -> String {
250250 let file_path = self.temp_dir.path().join(file_name);
251251 {
252252 let mut temp_file = File::create(&file_path).unwrap();
@@ -264,8 +264,8 @@ mod tests {
264264 syntax.name.clone()
265265 }
266266
267− fn syntax_name(&self, file_name: &str) -> String {
268− self.syntax_name_with_content(file_name, "")
267+ fn syntax_for_file(&self, file_name: &str) -> String {
268+ self.synax_for_file_with_content(file_name, "")
269269 }
270270 }
271271
@@ -273,22 +273,25 @@ mod tests {
273273 fn syntax_detection_basic() {
274274 let test = SyntaxDetectionTest::new();
275275
276− assert_eq!(test.syntax_name("test.rs"), "Rust");
277− assert_eq!(test.syntax_name("test.cpp"), "C++");
278− assert_eq!(test.syntax_name("test.build"), "NAnt Build File");
279− assert_eq!(test.syntax_name("PKGBUILD"), "Bourne Again Shell (bash)");
280− assert_eq!(test.syntax_name(".bashrc"), "Bourne Again Shell (bash)");
281− assert_eq!(test.syntax_name("Makefile"), "Makefile");
276+ assert_eq!(test.syntax_for_file("test.rs"), "Rust");
277+ assert_eq!(test.syntax_for_file("test.cpp"), "C++");
278+ assert_eq!(test.syntax_for_file("test.build"), "NAnt Build File");
279+ assert_eq!(
280+ test.syntax_for_file("PKGBUILD"),
281+ "Bourne Again Shell (bash)"
282+ );
283+ assert_eq!(test.syntax_for_file(".bashrc"), "Bourne Again Shell (bash)");
284+ assert_eq!(test.syntax_for_file("Makefile"), "Makefile");
282285 }
283286
284287 #[test]
285288 fn syntax_detection_well_defined_mapping_for_duplicate_extensions() {
286289 let test = SyntaxDetectionTest::new();
287290
288− assert_eq!(test.syntax_name("test.h"), "C++");
289− assert_eq!(test.syntax_name("test.sass"), "Sass");
290− assert_eq!(test.syntax_name("test.hs"), "Haskell (improved)");
291− assert_eq!(test.syntax_name("test.js"), "JavaScript (Babel)");
291+ assert_eq!(test.syntax_for_file("test.h"), "C++");
292+ assert_eq!(test.syntax_for_file("test.sass"), "Sass");
293+ assert_eq!(test.syntax_for_file("test.hs"), "Haskell (improved)");
294+ assert_eq!(test.syntax_for_file("test.js"), "JavaScript (Babel)");
292295 }
293296
294297 #[test]
@@ -296,35 +299,38 @@ mod tests {
296299 let test = SyntaxDetectionTest::new();
297300
298301 assert_eq!(
299− test.syntax_name_with_content("my_script", "#!/bin/bash"),
302+ test.synax_for_file_with_content("my_script", "#!/bin/bash"),
300303 "Bourne Again Shell (bash)"
301304 );
302305 assert_eq!(
303− test.syntax_name_with_content("build", "#!/bin/bash"),
306+ test.synax_for_file_with_content("build", "#!/bin/bash"),
304307 "Bourne Again Shell (bash)"
305308 );
306− assert_eq!(test.syntax_name_with_content("my_script", "<?php"), "PHP");
309+ assert_eq!(
310+ test.synax_for_file_with_content("my_script", "<?php"),
311+ "PHP"
312+ );
307313 }
308314
309315 #[test]
310316 fn syntax_detection_with_custom_mapping() {
311317 let mut test = SyntaxDetectionTest::new();
312318
313− assert_eq!(test.syntax_name("test.h"), "C++");
319+ assert_eq!(test.syntax_for_file("test.h"), "C++");
314320 test.syntax_mapping
315321 .insert("*.h", MappingTarget::MapTo("C"))
316322 .ok();
317− assert_eq!(test.syntax_name("test.h"), "C");
323+ assert_eq!(test.syntax_for_file("test.h"), "C");
318324 }
319325
320326 #[test]
321327 fn syntax_detection_is_case_sensitive() {
322328 let mut test = SyntaxDetectionTest::new();
323329
324− assert_ne!(test.syntax_name("README.MD"), "Markdown");
330+ assert_ne!(test.syntax_for_file("README.MD"), "Markdown");
325331 test.syntax_mapping
326332 .insert("*.MD", MappingTarget::MapTo("Markdown"))
327333 .ok();
328− assert_eq!(test.syntax_name("README.MD"), "Markdown");
334+ assert_eq!(test.syntax_for_file("README.MD"), "Markdown");
329335 }
330336}