Reformat using rustfmt, new style.

examples/animation_example.rs

@@ -20,9 +20,7 @@ fn main()
 	loop
 	{
 		fg.clear_axes();
-		fg.axes2d()
-			.set_y_range(Fix(-1.0), Fix(1.0))
-			.lines(x.iter(), x.iter().map(|&x| (x + t).sin()), &[]);
+		fg.axes2d().set_y_range(Fix(-1.0), Fix(1.0)).lines(x.iter(), x.iter().map(|&x| (x + t).sin()), &[]);
 		t += 0.1;
 		fg.show();
 		sleep(Duration::from_millis(500));

examples/common.rs

@@ -2,8 +2,8 @@
 
 extern crate argparse_rs;
 
-use gnuplot::*;
 use self::argparse_rs::*;
+use gnuplot::*;
 use std::env;
 
 #[derive(Copy, Clone)]

examples/example1.rs

@@ -13,16 +13,14 @@ fn example(c: Common)
 	let x = &[1.0f32, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0];
 	let x = x.iter2();
 	let y1: Vec<f32> = x.map(|&v| {
-			let z = v - 4.0;
-			z * z - 5.0
-		})
-		.collect();
+		let z = v - 4.0;
+		z * z - 5.0
+	}).collect();
 	let y1 = y1.iter2();
 	let y2: Vec<f32> = x.map(|&v| {
-			let z = v - 4.0;
-			-z * z + 5.0
-		})
-		.collect();
+		let z = v - 4.0;
+		-z * z + 5.0
+	}).collect();
 	let y2 = y2.iter2();
 	let y3: Vec<f32> = x.map(|&v| v - 4.0).collect();
 	let y3 = y3.iter2();
@@ -41,11 +39,13 @@ fn example(c: Common)
 		.set_border(true, &[Left, Bottom], &[LineWidth(2.0)])
 		.set_x_label("Abscissa", &[])
 		.set_y_label("Ordinate", &[])
-		.arrow(Axis(5.7912),
-		       Axis(2.7912),
-		       Axis(5.7912),
-		       Axis(1.7912),
-		       &[ArrowType(Closed), ArrowSize(0.1), LineWidth(2.0), Color("black")])
+		.arrow(
+			Axis(5.7912),
+			Axis(2.7912),
+			Axis(5.7912),
+			Axis(1.7912),
+			&[ArrowType(Closed), ArrowSize(0.1), LineWidth(2.0), Color("black")],
+		)
 		.label("Here", Axis(5.7912), Axis(3.1), &[TextAlign(AlignCenter)])
 		.fill_between(x, y1.map(|&y| y * 0.85 - 1.0), y1.map(|&y| y * 1.15 + 1.0), &[Color("#aaaaff")])
 		.lines(x, y1, &[Caption("(x - 4)^2 - 5"), LineWidth(1.5), Color("black")])
@@ -80,8 +80,7 @@ fn example(c: Common)
 	let mut fg = Figure::new();
 	c.set_term(&mut fg);
 
-	fg.axes2d()
-		.lines(x, y1, &[Caption("Lines"), LineWidth(3.0), Color("violet")]);
+	fg.axes2d().lines(x, y1, &[Caption("Lines"), LineWidth(3.0), Color("violet")]);
 
 	fg.axes2d()
 		.set_pos(0.2, 0.4)
@@ -126,10 +125,12 @@ fn example(c: Common)
 		.lines(x, y2, &[Color("black"), LineWidth(2.0), Caption("C")])
 		.lines(x, y3, &[Color("black"), LineWidth(2.0), LineStyle(DotDotDash), Caption("B")])
 		.set_title("Fill and legend fg1.6", &[])
-		.set_legend(Graph(0.5),
-		            Graph(-0.2),
-		            &[Horizontal, Placement(AlignCenter, AlignTop), Title("Legend Title")],
-		            &[TextAlign(AlignRight)]);
+		.set_legend(
+			Graph(0.5),
+			Graph(-0.2),
+			&[Horizontal, Placement(AlignCenter, AlignTop), Title("Legend Title")],
+			&[TextAlign(AlignRight)],
+		);
 
 	c.show(&mut fg, "fg1.6.gnuplot");
 
@@ -145,10 +146,18 @@ fn example(c: Common)
 		.set_x_label("X Label", &[Font("Arial", 24.0), TextColor("red"), Rotate(45.0)])
 		.set_y_label("Y Label", &[Rotate(0.0)])
 		.set_title("Goings nuts with the formatting fg1.7", &[Font("Times", 24.0), TextOffset(-10.0, 0.5)])
-		.label("Intersection",
-		       Axis(2.208),
-		       Axis(-1.791),
-		       &[MarkerSymbol('*'), TextAlign(AlignCenter), TextOffset(0.0, -1.0), MarkerColor("red"), MarkerSize(2.0)]);
+		.label(
+			"Intersection",
+			Axis(2.208),
+			Axis(-1.791),
+			&[
+				MarkerSymbol('*'),
+				TextAlign(AlignCenter),
+				TextOffset(0.0, -1.0),
+				MarkerColor("red"),
+				MarkerSize(2.0),
+			],
+		);
 
 	c.show(&mut fg, "fg1.7.gnuplot");
 }

examples/example2.rs

@@ -45,11 +45,13 @@ fn example(c: Common)
 	fg.axes2d()
 		.set_title("Arrows fg2.1", &[])
 		.lines(x, y1, &[LineWidth(3.0), Color("brown"), LineStyle(DotDash)])
-		.arrow(Graph(0.5),
-		       Graph(1.0),
-		       Axis(1.0),
-		       Axis(1.0),
-		       &[ArrowType(Filled), ArrowSize(0.1), LineStyle(DotDotDash), LineWidth(2.0), Color("red")])
+		.arrow(
+			Graph(0.5),
+			Graph(1.0),
+			Axis(1.0),
+			Axis(1.0),
+			&[ArrowType(Filled), ArrowSize(0.1), LineStyle(DotDotDash), LineWidth(2.0), Color("red")],
+		)
 		.arrow(Graph(0.5), Graph(1.0), Axis(3.0), Axis(9.0), &[ArrowType(Open), Color("green")]);
 
 	c.show(&mut fg, "fg2.1.gnuplot");
@@ -70,13 +72,15 @@ fn example(c: Common)
 	fg.axes2d()
 		.set_title("Axis Ticks fg2.3", &[])
 		.lines(x3, y3, &[LineWidth(2.0), Color("blue")])
-		.set_x_ticks_custom((0..5)
-			                    .map(|i| 2 * i)
-			                    .map(|x| Major(x as f32, Fix("%.2f ms".to_string())))
-			                    .chain((0..5).map(|i| 2 * i + 1).map(|x| Minor(x as f32)))
-			                    .chain(Some(Major(-2.1f32, Fix("%.2f ms".to_string()))).into_iter()),
-		                    &[MajorScale(2.0), MinorScale(0.5), OnAxis(true)],
-		                    &[TextColor("blue"), TextAlign(AlignCenter)])
+		.set_x_ticks_custom(
+			(0..5)
+				.map(|i| 2 * i)
+				.map(|x| Major(x as f32, Fix("%.2f ms".to_string())))
+				.chain((0..5).map(|i| 2 * i + 1).map(|x| Minor(x as f32)))
+				.chain(Some(Major(-2.1f32, Fix("%.2f ms".to_string()))).into_iter()),
+			&[MajorScale(2.0), MinorScale(0.5), OnAxis(true)],
+			&[TextColor("blue"), TextAlign(AlignCenter)],
+		)
 		.set_y_ticks(Some((Fix(2.0), 1)), &[Mirror(false), Format("%.1f s")], &[]);
 
 	c.show(&mut fg, "fg2.3.gnuplot");
@@ -98,9 +102,13 @@ fn example(c: Common)
 	let mut fg = Figure::new();
 	c.set_term(&mut fg);
 
-	fg.axes2d()
-		.set_title("Image fg2.5", &[])
-		.image(z1.iter(), zw, zh, Some((-4.0, -4.0, 4.0, 4.0)), &[]);
+	fg.axes2d().set_title("Image fg2.5", &[]).image(
+		z1.iter(),
+		zw,
+		zh,
+		Some((-4.0, -4.0, 4.0, 4.0)),
+		&[],
+	);
 
 	c.show(&mut fg, "fg2.5.gnuplot");
 

examples/example4.rs

@@ -98,12 +98,14 @@ fn example(c: Common)
 
 	c.show(&mut fg, "fg4.5.gnuplot");
 
-	let palette: [(f32, f32, f32, f32); 6] = [(0.00, 1.0, 0.0, 0.0),
-	                                          (0.33, 1.0, 0.0, 0.0),
-	                                          (0.33, 0.0, 1.0, 0.0),
-	                                          (0.66, 0.0, 1.0, 0.0),
-	                                          (0.66, 0.0, 0.0, 1.0),
-	                                          (1.00, 0.0, 0.0, 1.0)];
+	let palette: [(f32, f32, f32, f32); 6] = [
+		(0.00, 1.0, 0.0, 0.0),
+		(0.33, 1.0, 0.0, 0.0),
+		(0.33, 0.0, 1.0, 0.0),
+		(0.66, 0.0, 1.0, 0.0),
+		(0.66, 0.0, 0.0, 1.0),
+		(1.00, 0.0, 0.0, 1.0),
+	];
 
 	let mut fg = Figure::new();
 	c.set_term(&mut fg);

rustfmt.toml

@@ -10,6 +10,10 @@ fn_args_density = "Compressed"
 use_try_shorthand = true
 ideal_width = 120
 max_width = 140
-struct_lit_width = 35
+struct_variant_width = 100
+array_width = 100
+struct_lit_width = 100
 fn_call_width = 100
+chain_one_line_max = 100
+single_line_if_else_max_width = 0
 write_mode = "Overwrite"