Skip to content

Commit

Permalink
Rollup merge of rust-lang#68727 - xfix:remove-comment-about-pretty-pr…
Browse files Browse the repository at this point in the history
…inter-in-format-tests, r=jonas-schievink

Remove a comment about pretty printer in formatting tests

rustc is now using rustfmt, not the old formatter.
  • Loading branch information
Dylan-DPC authored Feb 1, 2020
2 parents b15b2d6 + cad0cfd commit 65c719c
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/test/ui/ifmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ pub fn main() {
let a: &dyn fmt::Debug = &1;
t!(format!("{:?}", a), "1");


// Formatting strings and their arguments
t!(format!("{}", "a"), "a");
t!(format!("{:4}", "a"), "a ");
Expand Down Expand Up @@ -187,10 +186,6 @@ pub fn main() {
// Ergonomic format_args!
t!(format!("{0:x} {0:X}", 15), "f F");
t!(format!("{0:x} {0:X} {}", 15), "f F 15");
// NOTE: For now the longer test cases must not be followed immediately by
// >1 empty lines, or the pretty printer will break. Since no one wants to
// touch the current pretty printer (#751), we have no choice but to work
// around it. Some of the following test cases are also affected.
t!(format!("{:x}{0:X}{a:x}{:X}{1:x}{a:X}", 13, 14, a=15), "dDfEeF");
t!(format!("{a:x} {a:X}", a=15), "f F");

Expand All @@ -201,7 +196,6 @@ pub fn main() {
t!(format!("{a:.*} {0} {:.*}", 4, 3, "efgh", a="abcdef"), "abcd 4 efg");
t!(format!("{:.a$} {a} {a:#x}", "aaaaaa", a=2), "aa 2 0x2");


// Test that pointers don't get truncated.
{
let val = usize::MAX;
Expand Down

0 comments on commit 65c719c

Please sign in to comment.