add rustfmt configuration, changed max line width to something more reasonable

coder543 · coder543 · commit b330f4506848 · 2016-10-01T14:13:21.000-05:00
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -0,0 +1 @@
+max_width = 200
diff --git a/src/lib.rs b/src/lib.rs
@@ -7,22 +7,22 @@
 //! use dataplotlib::util::{linspace, zip2};
 //! use dataplotlib::plotbuilder::PlotBuilder2D;
 //! use dataplotlib::plotter::Plotter;
-//! 
+//!
 //! fn main() {
 //!     let x = linspace(0, 10, 100);
-//!     
+//!
 //!     let y_sin = x.iter().map(|x| x.sin()).collect();
 //!     let xy_sin = zip2(&x, &y_sin);
-//! 
+//!
 //!     let xy_lin = zip2(&x, &x);
-//! 
+//!
 //!     // Creates a new plot builder
 //!     let mut pb = PlotBuilder2D::new();
-//!     
+//!
 //!     // Adds the sin plot and the linear plot with custom colors
 //!     pb.add_color_xy(xy_sin, [1.0, 0.0, 0.0, 1.0]);
 //!     pb.add_color_xy(xy_lin, [0.0, 0.0, 1.0, 1.0]);
-//!     
+//!
 //!     let mut plt = Plotter::new();
 //!     plt.plot2d(pb);
 //!     plt.join();
diff --git a/src/plot.rs b/src/plot.rs
@@ -51,12 +51,7 @@ fn get_min(user_min: Option<f64>, values: &Vec<f64>) -> f64 {
     }
 }
 
-fn draw_borders(bordercol: [f32; 4],
-                bgcol: [f32; 4],
-                space: f64,
-                m: f64,
-                transform: [[f64; 3]; 2],
-                g: &mut piston_window::G2d) {
+fn draw_borders(bordercol: [f32; 4], bgcol: [f32; 4], space: f64, m: f64, transform: [[f64; 3]; 2], g: &mut piston_window::G2d) {
     clear(bordercol, g);
     rectangle([0.0, 0.0, 1.0, 1.0],
               [space - 2.0, space - 2.0, m + 4.0, m + 4.0], // rectangle
@@ -80,11 +75,7 @@ fn set_xy(xy: &Vec<(f64, f64)>, x_vector: &mut Vec<Vec<f64>>, y_vector: &mut Vec
     }
 }
 
-fn draw_plots(window: &mut PistonWindow,
-              xs: &Vec<Vec<f64>>,
-              ys: &Vec<Vec<f64>>,
-              colors: &Vec<[f32; 4]>,
-              plot_bounds: [f64; 4]) {
+fn draw_plots(window: &mut PistonWindow, xs: &Vec<Vec<f64>>, ys: &Vec<Vec<f64>>, colors: &Vec<[f32; 4]>, plot_bounds: [f64; 4]) {
     let bordercol = [0.95, 0.95, 0.95, 1.0];
     let bgcol = [1.0, 1.0, 1.0, 1.0];
     let margin = 0.05;
@@ -110,8 +101,7 @@ fn draw_plots(window: &mut PistonWindow,
 
         for i in 0..colors.len() {
             let color = colors[i];
-            let xt: Vec<f64> =
-                xs[i].iter().map(|x| point2plot(*x, x_min, x_max, m, space)).collect();
+            let xt: Vec<f64> = xs[i].iter().map(|x| point2plot(*x, x_min, x_max, m, space)).collect();
             let yt: Vec<f64> = ys[i]
                 .iter()
                 .map(|y| (2.0 * space + m) - point2plot(*y, y_min, y_max, m, space))
@@ -134,10 +124,7 @@ fn draw_plots(window: &mut PistonWindow,
     }
 }
 
-fn get_plot_bounds(plot_builder: &PlotBuilder2D,
-                   xs: &Vec<Vec<f64>>,
-                   ys: &Vec<Vec<f64>>)
-                   -> [f64; 4] {
+fn get_plot_bounds(plot_builder: &PlotBuilder2D, xs: &Vec<Vec<f64>>, ys: &Vec<Vec<f64>>) -> [f64; 4] {
 
     let mut max_xs: Vec<f64> = Vec::new();
     let mut max_ys: Vec<f64> = Vec::new();
diff --git a/src/plotbuilder.rs b/src/plotbuilder.rs
@@ -104,4 +104,4 @@ impl PlotBuilder2D {
     pub fn add_fun_xy(&mut self, fun: PlotFn) {
         self.pvs.push(PlotVals2D::FunColor([1.0, 0.0, 0.0, 1.0], fun));
     }
-}
+}
diff --git a/src/plotter.rs b/src/plotter.rs
@@ -54,4 +54,4 @@ mod test {
         plt.plot2d(pb1);
         plt.join();
     }
-}
+}
diff --git a/src/util.rs b/src/util.rs
@@ -28,4 +28,4 @@ pub fn zip2<T>(a: &Vec<T>, b: &Vec<T>) -> Vec<(T, T)>
         ret.push((a[i], b[i]));
     }
     return ret;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -104,4 +104,4 @@ impl PlotBuilder2D {`
`104`	`104`	`pub fn add_fun_xy(&mut self, fun: PlotFn) {`
`105`	`105`	`self.pvs.push(PlotVals2D::FunColor([1.0, 0.0, 0.0, 1.0], fun));`
`106`	`106`	`}`
`107`		`-}`
	`107`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,4 @@ mod test {`
`54`	`54`	`plt.plot2d(pb1);`
`55`	`55`	`plt.join();`
`56`	`56`	`}`
`57`		`-}`
	`57`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,4 @@ pub fn zip2<T>(a: &Vec<T>, b: &Vec<T>) -> Vec<(T, T)>`
`28`	`28`	`ret.push((a[i], b[i]));`
`29`	`29`	`}`
`30`	`30`	`return ret;`
`31`		`-}`
	`31`	`+}`