From 5632831bd17ca662a61af090a12f17461ca5fe05 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 14 Jan 2016 22:04:24 -0500 Subject: [PATCH] Clean up function names for checkstyle output. --- src/checkstyle.rs | 4 ++-- src/filemap.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/checkstyle.rs b/src/checkstyle.rs index 2a276dce120..e25bfc03ba4 100644 --- a/src/checkstyle.rs +++ b/src/checkstyle.rs @@ -12,7 +12,7 @@ use std::io::{self, Write, Read, stdout}; use config::WriteMode; -pub fn output_heading(mode: WriteMode) -> Result<(), io::Error> { +pub fn output_header(mode: WriteMode) -> Result<(), io::Error> { let stdout = stdout(); let mut stdout = stdout.lock(); if mode == WriteMode::Checkstyle { @@ -25,7 +25,7 @@ pub fn output_heading(mode: WriteMode) -> Result<(), io::Error> { Ok(()) } -pub fn output_footing(mode: WriteMode) -> Result<(), io::Error> { +pub fn output_footer(mode: WriteMode) -> Result<(), io::Error> { let stdout = stdout(); let mut stdout = stdout.lock(); if mode == WriteMode::Checkstyle { diff --git a/src/filemap.rs b/src/filemap.rs index a2cba78ae96..dabf7ade3e1 100644 --- a/src/filemap.rs +++ b/src/filemap.rs @@ -19,7 +19,7 @@ use std::io::{self, Write, Read, stdout, BufWriter}; use config::{NewlineStyle, Config, WriteMode}; use rustfmt_diff::{make_diff, print_diff, Mismatch}; -use checkstyle::{output_heading, output_footing, output_checkstyle_file}; +use checkstyle::{output_header, output_footer, output_checkstyle_file}; // A map of the files of a crate, with their new content pub type FileMap = HashMap; @@ -35,11 +35,11 @@ pub fn write_all_files(file_map: &FileMap, mode: WriteMode, config: &Config) -> Result<(), io::Error> { - output_heading(mode).ok(); + output_header(mode).ok(); for filename in file_map.keys() { try!(write_file(&file_map[filename], filename, mode, config)); } - output_footing(mode).ok(); + output_footer(mode).ok(); Ok(()) }