From 8ccaa83e90f3520ae919c206eed92121f603763f Mon Sep 17 00:00:00 2001
From: Michael Recachinas <mgr3yp@virginia.edu>
Date: Sat, 21 Apr 2018 19:23:59 +0100
Subject: [PATCH] Add more tests to print_ and write_literal

Also, move precision, width, and debug fmt tests to 'should pass'
---
 tests/ui/print_literal.rs | 13 ++++++++++---
 tests/ui/write_literal.rs | 21 ++++++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/tests/ui/print_literal.rs b/tests/ui/print_literal.rs
index c803294ab0a..272e1c168d3 100644
--- a/tests/ui/print_literal.rs
+++ b/tests/ui/print_literal.rs
@@ -9,16 +9,23 @@ fn main() {
     let world = "world";
     println!("Hello {}", world);
     println!("3 in hex is {:X}", 3);
+    println!("2 + 1 = {:.4}", 3);
+    println!("2 + 1 = {:5.4}", 3);
+    println!("Debug test {:?}", "hello, world");
+    println!("{0:8} {1:>8}", "hello", "world");
+    println!("{1:8} {0:>8}", "hello", "world");
+    println!("{foo:8} {bar:>8}", foo="hello", bar="world");
+    println!("{bar:8} {foo:>8}", foo="hello", bar="world");
+    println!("{number:>width$}", number=1, width=6);
+    println!("{number:>0width$}", number=1, width=6);
 
     // these should throw warnings
+    println!("{} of {:b} people know binary, the other half doesn't", 1, 2);
     print!("Hello {}", "world");
     println!("Hello {} {}", world, "world");
     println!("Hello {}", "world");
     println!("10 / 4 is {}", 2.5);
     println!("2 + 1 = {}", 3);
-    println!("2 + 1 = {:.4}", 3);
-    println!("2 + 1 = {:5.4}", 3);
-    println!("Debug test {:?}", "hello, world");
 
     // positional args don't change the fact
     // that we're using a literal -- this should
diff --git a/tests/ui/write_literal.rs b/tests/ui/write_literal.rs
index dd3a869eb4e..b09640a18eb 100644
--- a/tests/ui/write_literal.rs
+++ b/tests/ui/write_literal.rs
@@ -6,22 +6,29 @@ use std::io::Write;
 fn main() {
     let mut v = Vec::new();
 
-    // These should be fine
+    // these should be fine
     write!(&mut v, "Hello");
     writeln!(&mut v, "Hello");
     let world = "world";
     writeln!(&mut v, "Hello {}", world);
     writeln!(&mut v, "3 in hex is {:X}", 3);
+    writeln!(&mut v, "2 + 1 = {:.4}", 3);
+    writeln!(&mut v, "2 + 1 = {:5.4}", 3);
+    writeln!(&mut v, "Debug test {:?}", "hello, world");
+    writeln!(&mut v, "{0:8} {1:>8}", "hello", "world");
+    writeln!(&mut v, "{1:8} {0:>8}", "hello", "world");
+    writeln!(&mut v, "{foo:8} {bar:>8}", foo="hello", bar="world");
+    writeln!(&mut v, "{bar:8} {foo:>8}", foo="hello", bar="world");
+    writeln!(&mut v, "{number:>width$}", number=1, width=6);
+    writeln!(&mut v, "{number:>0width$}", number=1, width=6);
 
-    // These should throw warnings
+    // these should throw warnings
+    writeln!(&mut v, "{} of {:b} people know binary, the other half doesn't", 1, 2);
     write!(&mut v, "Hello {}", "world");
     writeln!(&mut v, "Hello {} {}", world, "world");
     writeln!(&mut v, "Hello {}", "world");
     writeln!(&mut v, "10 / 4 is {}", 2.5);
     writeln!(&mut v, "2 + 1 = {}", 3);
-    writeln!(&mut v, "2 + 1 = {:.4}", 3);
-    writeln!(&mut v, "2 + 1 = {:5.4}", 3);
-    writeln!(&mut v, "Debug test {:?}", "hello, world");
 
     // positional args don't change the fact
     // that we're using a literal -- this should
@@ -30,6 +37,6 @@ fn main() {
     writeln!(&mut v, "{1} {0}", "hello", "world");
 
     // named args shouldn't change anything either
-    writeln!(&mut v, "{foo} {bar}", foo = "hello", bar = "world");
-    writeln!(&mut v, "{bar} {foo}", foo = "hello", bar = "world");
+    writeln!(&mut v, "{foo} {bar}", foo="hello", bar="world");
+    writeln!(&mut v, "{bar} {foo}", foo="hello", bar="world");
 }