Skip to content

rustfmt libterm #31014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libterm/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ pub mod terminfo;
mod win;

/// Alias for stdout terminals.
pub type StdoutTerminal = Terminal<Output=Stdout> + Send;
pub type StdoutTerminal = Terminal<Output = Stdout> + Send;
/// Alias for stderr terminals.
pub type StderrTerminal = Terminal<Output=Stderr> + Send;
pub type StderrTerminal = Terminal<Output = Stderr> + Send;

#[cfg(not(windows))]
/// Return a Terminal wrapping stdout, or None if a terminal couldn't be
Expand Down
4 changes: 2 additions & 2 deletions src/libterm/terminfo/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ pub struct TerminfoTerminal<T> {
ti: TermInfo,
}

impl<T: Write+Send> Terminal for TerminfoTerminal<T> {
impl<T: Write + Send> Terminal for TerminfoTerminal<T> {
type Output = T;
fn fg(&mut self, color: color::Color) -> io::Result<bool> {
let color = self.dim_if_necessary(color);
Expand Down Expand Up @@ -220,7 +220,7 @@ impl<T: Write+Send> Terminal for TerminfoTerminal<T> {
}
}

impl<T: Write+Send> TerminfoTerminal<T> {
impl<T: Write + Send> TerminfoTerminal<T> {
/// Create a new TerminfoTerminal with the given TermInfo and Write.
pub fn new_with_terminfo(out: T, terminfo: TermInfo) -> TerminfoTerminal<T> {
let nc = if terminfo.strings.contains_key("setaf") &&
Expand Down
4 changes: 2 additions & 2 deletions src/libterm/win.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fn bits_to_color(bits: u16) -> color::Color {
color | (bits & 0x8) // copy the hi-intensity bit
}

impl<T: Write+Send+'static> WinConsole<T> {
impl<T: Write + Send + 'static> WinConsole<T> {
fn apply(&mut self) {
let _unused = self.buf.flush();
let mut accum: WORD = 0;
Expand Down Expand Up @@ -148,7 +148,7 @@ impl<T: Write> Write for WinConsole<T> {
}
}

impl<T: Write+Send+'static> Terminal for WinConsole<T> {
impl<T: Write + Send + 'static> Terminal for WinConsole<T> {
type Output = T;

fn fg(&mut self, color: color::Color) -> io::Result<bool> {
Expand Down