Applied rustfmt on code

7 files changed, 272 insertions, 268 deletions

diff --git a/examples/basic.rs b/examples/basic.rs
index 111328f..4ca5d39 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -1,8 +1,9 @@
-#[macro_use] extern crate prettytable;

-use prettytable::Table;

-use prettytable::row::Row;

-use prettytable::cell::Cell;

-

+#[macro_use]
+extern crate prettytable;
+use prettytable::Table;
+use prettytable::row::Row;
+use prettytable::cell::Cell;
+
 /*

     Following main function will print :

     +---------+------+---------+

@@ -20,30 +21,24 @@ use prettytable::cell::Cell;
     +---------+------+---------+

     | foobar2 | bar2 | new_foo |

     +---------+------+---------+

-*/

-fn main() {

-    let mut table = Table::new();

-    table.add_row(row!["ABC", "DEFG", "HIJKLMN"]);

-    table.add_row(row!["foobar", "bar", "foo"]);

-    table.add_row(Row::new(vec![

-            Cell::new("foobar2"),

-            Cell::new("bar2"),

-            Cell::new("foo2")])

-        );

-    table.printstd();

-    println!("Modified : ");

-    table.set_element("new_foo", 2, 1).unwrap();

-    table.printstd();

-

-    // The same table can be built the following way :

-    let _table = table!(["ABC", "DEFG", "HIJKLMN"],

-                       ["foobar", "bar", "foo"],

-                       ["foobar2", "bar2", "foo2"]

-                      );

-

-    // Or directly print it like this

-    let _table = ptable!(["ABC", "DEFG", "HIJKLMN"],

-                       ["foobar", "bar", "foo"],

-                       ["foobar2", "bar2", "foo2"]

-                      );

-}

+*/
+fn main() {
+    let mut table = Table::new();
+    table.add_row(row!["ABC", "DEFG", "HIJKLMN"]);
+    table.add_row(row!["foobar", "bar", "foo"]);
+    table.add_row(Row::new(vec![Cell::new("foobar2"), Cell::new("bar2"), Cell::new("foo2")]));
+    table.printstd();
+    println!("Modified : ");
+    table.set_element("new_foo", 2, 1).unwrap();
+    table.printstd();
+
+    // The same table can be built the following way :
+    let _table = table!(["ABC", "DEFG", "HIJKLMN"],
+                        ["foobar", "bar", "foo"],
+                        ["foobar2", "bar2", "foo2"]);
+
+    // Or directly print it like this
+    let _table = ptable!(["ABC", "DEFG", "HIJKLMN"],
+                         ["foobar", "bar", "foo"],
+                         ["foobar2", "bar2", "foo2"]);
+}
diff --git a/examples/csv.rs b/examples/csv.rs
index 68958ef..dd104af 100644
--- a/examples/csv.rs
+++ b/examples/csv.rs
@@ -20,7 +20,8 @@ fn main() {
 
     let table = Table::from_csv_string("ABC,DEFG,HIJKLMN\n\
                                         foobar,bar,foo\n\
-                                        foobar2,bar2,foo2").unwrap();
+                                        foobar2,bar2,foo2")
+            .unwrap();
     table.printstd();
 
     println!("");
diff --git a/examples/formatting.rs b/examples/formatting.rs
index d994796..a3cbc51 100644
--- a/examples/formatting.rs
+++ b/examples/formatting.rs
@@ -1,87 +1,86 @@
-#[macro_use] extern crate prettytable;

-use prettytable::format;

-

-fn main() {

-    let mut table = table!(["Value 1", "Value 2"], ["Value three", "Value four"]);

-    table.set_titles(row!["Title 1", "Title 2"]);

-

-    // Print

-    // +-------------+------------+

-    // | Title 1     | Title 2    |

-    // +-------------+------------+

-    // | Value 1     | Value 2    |

-    // | Value three | Value four |

-    // +-------------+------------+

-    println!("FORMAT_NO_LINESEP_WITH_TITLE :");

-    table.set_format(*format::consts::FORMAT_NO_LINESEP_WITH_TITLE);

-    table.printstd();

-    println!("");

-

-    // Print

-    // -------------------------

-    //  Title 1      Title 2

-    // =========================

-    //  Value 1      Value 2

-    // -------------------------

-    //  Value three  Value four

-    // -------------------------

-    println!("FORMAT_NO_COLSEP :");

-    table.set_format(*format::consts::FORMAT_NO_COLSEP);

-    table.printstd();

-    println!("");

-

-    // Print

-    // +-------------------------+

-    // | Title 1      Title 2    |

-    // +=========================+

-    // | Value 1      Value 2    |

-    // | Value three  Value four |

-    // +-------------------------+

-    println!("FORMAT_BORDERS_ONLY :");

-    table.set_format(*format::consts::FORMAT_BORDERS_ONLY);

-    table.printstd();

-    println!("");

-

-    // Custom format can be implemented using `prettytable::format::FormatBuilder`

-    // Example to print

-    // +-------------+------------+

-    // | Title 1     | Title 2    |

-    // | Value 1     | Value 2    |

-    // | Value three | Value four |

-    // +-------------+------------+

-    println!("Custom :");

-    table.set_format(

-        format::FormatBuilder::new()

-            .column_separator('|')

-            .borders('|')

-            .separators(

-                &[format::LinePosition::Top, format::LinePosition::Bottom],

-                format::LineSeparator::new('-', '+', '+', '+')

-            )

-            .padding(1, 1)

-            .build()

-    );

-    table.printstd();

-

-    // Customized format with unicode

-    // Example to print

-    // ┌─────────────┬────────────┐

-    // | Title 1     | Title 2    |

-    // ├─────────────┼────────────┤

-    // | Value 1     | Value 2    |

-    // ├─────────────┼────────────┤

-    // | Value three | Value four |

-    // └─────────────┴────────────┘

-    println!("With unicode:");

-    table.set_format(

-        format::FormatBuilder::new()

-            .column_separator('|')

-            .borders('|')

-            .separators( &[format::LinePosition::Top],    format::LineSeparator::new('─', '┬', '┌', '┐'))

-            .separators( &[format::LinePosition::Intern], format::LineSeparator::new('─', '┼', '├', '┤'))

-            .separators( &[format::LinePosition::Bottom], format::LineSeparator::new('─', '┴', '└', '┘'))

-            .padding(1, 1)

-            .build()

-    );

-    table.printstd();

-}

+#[macro_use]
+extern crate prettytable;
+use prettytable::format;
+
+fn main() {
+    let mut table = table!(["Value 1", "Value 2"], ["Value three", "Value four"]);
+    table.set_titles(row!["Title 1", "Title 2"]);
+
+    // Print
+    // +-------------+------------+
+    // | Title 1     | Title 2    |
+    // +-------------+------------+
+    // | Value 1     | Value 2    |
+    // | Value three | Value four |
+    // +-------------+------------+
+    println!("FORMAT_NO_LINESEP_WITH_TITLE :");
+    table.set_format(*format::consts::FORMAT_NO_LINESEP_WITH_TITLE);
+    table.printstd();
+    println!("");
+
+    // Print
+    // -------------------------
+    //  Title 1      Title 2
+    // =========================
+    //  Value 1      Value 2
+    // -------------------------
+    //  Value three  Value four
+    // -------------------------
+    println!("FORMAT_NO_COLSEP :");
+    table.set_format(*format::consts::FORMAT_NO_COLSEP);
+    table.printstd();
+    println!("");
+
+    // Print
+    // +-------------------------+
+    // | Title 1      Title 2    |
+    // +=========================+
+    // | Value 1      Value 2    |
+    // | Value three  Value four |
+    // +-------------------------+
+    println!("FORMAT_BORDERS_ONLY :");
+    table.set_format(*format::consts::FORMAT_BORDERS_ONLY);
+    table.printstd();
+    println!("");
+
+    // Custom format can be implemented using `prettytable::format::FormatBuilder`
+    // Example to print
+    // +-------------+------------+
+    // | Title 1     | Title 2    |
+    // | Value 1     | Value 2    |
+    // | Value three | Value four |
+    // +-------------+------------+
+    println!("Custom :");
+    table.set_format(format::FormatBuilder::new()
+                         .column_separator('|')
+                         .borders('|')
+                         .separators(&[format::LinePosition::Top,
+                                       format::LinePosition::Bottom],
+                                     format::LineSeparator::new('-', '+', '+', '+'))
+                         .padding(1, 1)
+                         .build());
+    table.printstd();
+
+    // Customized format with unicode
+    // Example to print
+    // ┌─────────────┬────────────┐
+    // | Title 1     | Title 2    |
+    // ├─────────────┼────────────┤
+    // | Value 1     | Value 2    |
+    // ├─────────────┼────────────┤
+    // | Value three | Value four |
+    // └─────────────┴────────────┘
+    println!("With unicode:");
+    table.set_format(format::FormatBuilder::new()
+                         .column_separator('|')
+                         .borders('|')
+                         .separators(&[format::LinePosition::Top],
+                                     format::LineSeparator::new('─', '┬', '┌', '┐'))
+                         .separators(&[format::LinePosition::Intern],
+                                     format::LineSeparator::new('─', '┼', '├', '┤'))
+                         .separators(&[format::LinePosition::Bottom],
+                                     format::LineSeparator::new('─', '┴', '└', '┘'))
+                         .padding(1, 1)
+                         .build());
+    table.printstd();
+}
diff --git a/examples/multiline.rs b/examples/multiline.rs
index 3015fe6..e633531 100644
--- a/examples/multiline.rs
+++ b/examples/multiline.rs
@@ -1,5 +1,6 @@
-#[macro_use] extern crate prettytable;

-

+#[macro_use]
+extern crate prettytable;
+
 /*

     Following main function will print :

     +-------------------------+------------------------------+

@@ -17,15 +18,13 @@
     |                         | | foobar2 | bar2 | foo2    | |

     |                         | +---------+------+---------+ |

     +-------------------------+------------------------------+

-*/

-fn main() {

-    let table1 = table!(["ABC", "DEFG", "HIJKLMN"],

-                       ["foobar", "bar", "foo"],

-                       ["foobar2", "bar2", "foo2"]

-                      );

-    let table2 = table!(["Title 1", "Title 2"],

-                        ["This is\na multiline\ncell", "foo"],

-                        ["Yo dawg ;) You can even\nprint tables\ninto tables", table1]

-                        );

-    table2.printstd();

-}

+*/
+fn main() {
+    let table1 = table!(["ABC", "DEFG", "HIJKLMN"],
+                        ["foobar", "bar", "foo"],
+                        ["foobar2", "bar2", "foo2"]);
+    let table2 = table!(["Title 1", "Title 2"],
+                        ["This is\na multiline\ncell", "foo"],
+                        ["Yo dawg ;) You can even\nprint tables\ninto tables", table1]);
+    table2.printstd();
+}
diff --git a/examples/slices.rs b/examples/slices.rs
index 1bef3a3..38e07ee 100644
--- a/examples/slices.rs
+++ b/examples/slices.rs
@@ -1,15 +1,16 @@
-#[macro_use] extern crate prettytable;

-

-use prettytable::Slice;

-

-fn main() {

-    let mut table = table![[0, 0, 0], [1, 1, 1], [2, 2, 2], [3, 3, 3], [4, 4, 4], [5, 5, 5]];

-    table.set_titles(row!["t1", "t2", "t3"]);

-

-    let slice = table.slice(..);

-    let slice = slice.slice(2..);

-    let slice = slice.slice(..3);

-

+#[macro_use]
+extern crate prettytable;
+
+use prettytable::Slice;
+
+fn main() {
+    let mut table = table![[0, 0, 0], [1, 1, 1], [2, 2, 2], [3, 3, 3], [4, 4, 4], [5, 5, 5]];
+    table.set_titles(row!["t1", "t2", "t3"]);
+
+    let slice = table.slice(..);
+    let slice = slice.slice(2..);
+    let slice = slice.slice(..3);
+
     /*

         Will print

         +----+----+----+

@@ -21,10 +22,10 @@ fn main() {
         +----+----+----+

         | 4  | 4  | 4  |

         +----+----+----+

-    */

-    slice.printstd();

-

-    // This is equivalent to

-    let slice = table.slice(2..5);

-    slice.printstd();

-}

+    */
+    slice.printstd();
+
+    // This is equivalent to
+    let slice = table.slice(2..5);
+    slice.printstd();
+}
diff --git a/examples/style.rs b/examples/style.rs
index 8191372..843061f 100644
--- a/examples/style.rs
+++ b/examples/style.rs
@@ -1,19 +1,20 @@
-#[macro_use] extern crate prettytable;

-extern crate term;

-use prettytable::Table;

-use prettytable::row::Row;

-use prettytable::cell::Cell;

-

-use term::{Attr, color};

-

-#[allow(dead_code)]

-fn main() {

-    let _ = table!();

-    let mut table = Table::new();

-    // Add style to a cell

-    table.add_row(row![FrByb->"ABC", "DEFG", "HIJKLMN"]);

-    // Add style to a full row

-    table.add_row(row![FY => "styled", "bar", "foo"]);

+#[macro_use]
+extern crate prettytable;
+extern crate term;
+use prettytable::Table;
+use prettytable::row::Row;
+use prettytable::cell::Cell;
+
+use term::{Attr, color};
+
+#[allow(dead_code)]
+fn main() {
+    let _ = table!();
+    let mut table = Table::new();
+    // Add style to a cell
+    table.add_row(row![FrByb->"ABC", "DEFG", "HIJKLMN"]);
+    // Add style to a full row
+    table.add_row(row![FY => "styled", "bar", "foo"]);
     table.add_row(Row::new(vec![

             Cell::new("foobar2"),

             // Create a cell with a red foreground color

@@ -22,17 +23,17 @@ fn main() {
             Cell::new("foo2").style_spec("FrByb"),

             // Using the cell! macro

             cell!(Fr->"red")])

-        );

-

-    table.printstd();

-

-    // Print a table with some styles on it :

-    // FrBybl means : Foregound red, Background yellow, bold, left align

-     ptable!([FrBybl->"A", "B", FrBybr->"C"], [123, 234, 345, 456], [Fg => 1, 2, 3]);

-

-     // You can also apply style to full rows :

-    let mut table = table!([Frb => "A", "B", "C"], [1, 2, 3, 4], ["A\nBCCZZZ\nDDD", 2, table]);

-    // Set a title line, with all text centered in the cell

-    table.set_titles(row![c => "Title 1", "Title 2"]);

-    table.printstd();

-}

+        );
+
+    table.printstd();
+
+    // Print a table with some styles on it :
+    // FrBybl means : Foregound red, Background yellow, bold, left align
+    ptable!([FrBybl->"A", "B", FrBybr->"C"], [123, 234, 345, 456], [Fg => 1, 2, 3]);
+
+    // You can also apply style to full rows :
+    let mut table = table!([Frb => "A", "B", "C"], [1, 2, 3, 4], ["A\nBCCZZZ\nDDD", 2, table]);
+    // Set a title line, with all text centered in the cell
+    table.set_titles(row![c => "Title 1", "Title 2"]);
+    table.printstd();
+}
diff --git a/examples/tictactoe.rs b/examples/tictactoe.rs
index 3d25057..49444eb 100644
--- a/examples/tictactoe.rs
+++ b/examples/tictactoe.rs
@@ -1,90 +1,98 @@
-#[macro_use]extern crate prettytable;

-use prettytable::Table;

-

-use std::io;

-use std::io::Write;

-use std::str::FromStr;

-

-const CROSS: &'static str = "X";

-const EMPTY: &'static str = " ";

-const ROUND: &'static str = "O";

-

-fn main() {

-    let mut table = table![[EMPTY, EMPTY, EMPTY], [EMPTY, EMPTY, EMPTY], [EMPTY, EMPTY, EMPTY]];

-    table.printstd();

-    let stdin = io::stdin();

-    let mut stdout = io::stdout();

-    let mut current = CROSS;

-    loop {

-        let mut line = String::new();

-        print!("{} plays > ", current);

-        stdout.flush().unwrap();

-        stdin.read_line(&mut line).expect("Cannot read input");

+#[macro_use]
+extern crate prettytable;
+use prettytable::Table;
+
+use std::io;
+use std::io::Write;
+use std::str::FromStr;
+
+const CROSS: &'static str = "X";
+const EMPTY: &'static str = " ";
+const ROUND: &'static str = "O";
+
+fn main() {
+    let mut table = table![[EMPTY, EMPTY, EMPTY],
+                           [EMPTY, EMPTY, EMPTY],
+                           [EMPTY, EMPTY, EMPTY]];
+    table.printstd();
+    let stdin = io::stdin();
+    let mut stdout = io::stdout();
+    let mut current = CROSS;
+    loop {
+        let mut line = String::new();
+        print!("{} plays > ", current);
+        stdout.flush().unwrap();
+        stdin.read_line(&mut line).expect("Cannot read input");
         let i = match usize::from_str(line.trim()) {

             Ok(i) => i,

-            _ => {

-                println!("Bad input");

-                continue;

+            _ => {
+                println!("Bad input");
+                continue;
             }

-        };

-        if i < 1 || i > 9 {

-            println!("Bad input, should be between 1 and 9");

-            continue;

-        }

-        let x = (i-1)%3;

-        let y = (i-1)/3;

-        {

-            let mut row = table.get_mut_row(y).unwrap();

-            if row.get_cell(x).unwrap().to_string() != EMPTY {

-                println!("There's already someone there");

-                continue;

-            }

-            row.set_cell(cell!(current), x).unwrap();

-        }

-        table.printstd();

-        if check(&table) {

-            return

-        }

-        if current == CROSS {

-            current = ROUND;

-        } else {

-            current = CROSS;

-        }

-    }

-}

-

-fn get(table: &Table, x: usize, y: usize) -> String {

+        };
+        if i < 1 || i > 9 {
+            println!("Bad input, should be between 1 and 9");
+            continue;
+        }
+        let x = (i - 1) % 3;
+        let y = (i - 1) / 3;
+        {
+            let mut row = table.get_mut_row(y).unwrap();
+            if row.get_cell(x).unwrap().to_string() != EMPTY {
+                println!("There's already someone there");
+                continue;
+            }
+            row.set_cell(cell!(current), x).unwrap();
+        }
+        table.printstd();
+        if check(&table) {
+            return;
+        }
+        if current == CROSS {
+            current = ROUND;
+        } else {
+            current = CROSS;
+        }
+    }
+}
+
+fn get(table: &Table, x: usize, y: usize) -> String {
     match table.get_row(y) {

-        Some(ref r) => match r.get_cell(x){

-            Some(ref c) => c.to_string(),

-            _ => EMPTY.to_string()

-        },

-        _ => EMPTY.to_string()

-    }

-}

-

-fn is(table: &Table, s : &str, x: usize, y: usize) -> bool {

-    get(table, x, y).as_str() == s

-}

-

-fn check(table: &Table) -> bool {

-    let mut full = true;

-    for y in 0..3 {

-        for x in 0..3 {

-            if is(table, EMPTY, x, y) {

-                full = false;

-                continue;

-            }

-            let current = get(table, x, y);

-            let c = current.as_str();

-            if is(table, c, x+1, y) && is(table, c, x+2, y) || is(table, c, x+1, y+1) && is(table, c, x+2, y+2) || x >= 2 && is(table, c, x-1, y+1) && is(table, c, x-2, y+2) || is(table, c, x, y+1) && is(table, c, x, y+2) {

-                println!("Game is over. {} is the winner", current);

-                return true;

-            }

+        Some(ref r) => {
+            match r.get_cell(x) {

+                Some(ref c) => c.to_string(),

+                _ => EMPTY.to_string(),

+            }
         }

-    }

-    if full {

-        println!("Game is over. It's a draw");

-    }

-    return full;

-}

+        _ => EMPTY.to_string(),

+    }
+}
+
+fn is(table: &Table, s: &str, x: usize, y: usize) -> bool {
+    get(table, x, y).as_str() == s
+}
+
+fn check(table: &Table) -> bool {
+    let mut full = true;
+    for y in 0..3 {
+        for x in 0..3 {
+            if is(table, EMPTY, x, y) {
+                full = false;
+                continue;
+            }
+            let current = get(table, x, y);
+            let c = current.as_str();
+            if is(table, c, x + 1, y) && is(table, c, x + 2, y) ||
+               is(table, c, x + 1, y + 1) && is(table, c, x + 2, y + 2) ||
+               x >= 2 && is(table, c, x - 1, y + 1) && is(table, c, x - 2, y + 2) ||
+               is(table, c, x, y + 1) && is(table, c, x, y + 2) {
+                println!("Game is over. {} is the winner", current);
+                return true;
+            }
+        }
+    }
+    if full {
+        println!("Game is over. It's a draw");
+    }
+    return full;
+}