From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/pretty/asm.pp | 34 --- src/test/pretty/asm.rs | 31 --- src/test/pretty/ast-stmt-expr-attr.rs | 175 ------------- src/test/pretty/async.rs | 9 - src/test/pretty/attr-derive.rs | 32 --- src/test/pretty/attr-fn-inner.rs | 16 -- src/test/pretty/attr-literals.rs | 14 -- src/test/pretty/attr-tokens-raw-ident.rs | 7 - src/test/pretty/auto-trait.rs | 9 - src/test/pretty/auxiliary/derive-foo.rs | 13 - src/test/pretty/blank-lines.rs | 17 -- .../pretty/block-comment-multiple-asterisks.rs | 6 - .../pretty/block-comment-trailing-whitespace.rs | 10 - .../pretty/block-comment-trailing-whitespace2.rs | 8 - src/test/pretty/block-comment-wchar.pp | 101 -------- src/test/pretty/block-comment-wchar.rs | 100 -------- src/test/pretty/block-disambig.rs | 59 ----- src/test/pretty/cast-lt.pp | 13 - src/test/pretty/cast-lt.rs | 11 - src/test/pretty/closure-reform-pretty.rs | 16 -- src/test/pretty/delimited-token-groups.rs | 48 ---- src/test/pretty/disamb-stmt-expr.rs | 10 - src/test/pretty/do1.rs | 5 - src/test/pretty/doc-comments.rs | 53 ---- src/test/pretty/dollar-crate.pp | 13 - src/test/pretty/dollar-crate.rs | 7 - src/test/pretty/empty-impl.rs | 7 - src/test/pretty/empty-lines.rs | 9 - src/test/pretty/enum-variant-vis.rs | 8 - src/test/pretty/example1.rs | 3 - src/test/pretty/example2.pp | 3 - src/test/pretty/example2.rs | 3 - src/test/pretty/expanded-and-path-remap-80832.pp | 13 - src/test/pretty/expanded-and-path-remap-80832.rs | 7 - src/test/pretty/fn-return.rs | 7 - src/test/pretty/fn-types.rs | 5 - src/test/pretty/fn-variadic.rs | 15 -- src/test/pretty/for-comment.rs | 11 - src/test/pretty/gat-bounds.rs | 16 -- src/test/pretty/hir-pretty-loop.pp | 9 - src/test/pretty/hir-pretty-loop.rs | 9 - src/test/pretty/if-attr.rs | 37 --- src/test/pretty/import-renames.rs | 6 - src/test/pretty/issue-12590-a.rs | 9 - src/test/pretty/issue-12590-b.rs | 5 - src/test/pretty/issue-12590-c.pp | 19 -- src/test/pretty/issue-12590-c.rs | 10 - src/test/pretty/issue-19077.rs | 11 - src/test/pretty/issue-25031.rs | 8 - src/test/pretty/issue-30731.rs | 8 - src/test/pretty/issue-31073.pp | 7 - src/test/pretty/issue-31073.rs | 7 - src/test/pretty/issue-4264.pp | 57 ----- src/test/pretty/issue-4264.rs | 39 --- .../pretty/issue-68710-field-attr-proc-mac-lost.rs | 17 -- src/test/pretty/issue-73626.rs | 34 --- src/test/pretty/issue-74745.rs | 5 - src/test/pretty/issue-85089.pp | 20 -- src/test/pretty/issue-85089.rs | 16 -- src/test/pretty/let.rs | 9 - src/test/pretty/lifetime.rs | 5 - src/test/pretty/macro.rs | 7 - src/test/pretty/macro_rules.rs | 19 -- src/test/pretty/match-block-expr.rs | 6 - src/test/pretty/match-naked-expr-medium.rs | 14 -- src/test/pretty/match-naked-expr.rs | 10 - src/test/pretty/nested-item-vis-defaultness.rs | 47 ---- src/test/pretty/path-type-bounds.rs | 15 -- src/test/pretty/qpath-associated-type-bound.rs | 16 -- src/test/pretty/raw-address-of.rs | 12 - src/test/pretty/raw-str-nonexpr.rs | 9 - src/test/pretty/stmt_expr_attributes.rs | 271 --------------------- src/test/pretty/struct-pattern.rs | 5 - src/test/pretty/struct-tuple.rs | 10 - src/test/pretty/tag-blank-lines.rs | 8 - src/test/pretty/tests-are-sorted.pp | 69 ------ src/test/pretty/tests-are-sorted.rs | 13 - src/test/pretty/top-level-doc-comments.rs | 8 - src/test/pretty/trait-inner-attr.rs | 7 - src/test/pretty/trait-polarity.rs | 9 - src/test/pretty/trait-safety.rs | 15 -- src/test/pretty/unary-op-disambig.rs | 19 -- src/test/pretty/use-tree.rs | 23 -- src/test/pretty/vec-comments.pp | 29 --- src/test/pretty/vec-comments.rs | 29 --- src/test/pretty/where-clauses.rs | 8 - src/test/pretty/yeet-expr.rs | 12 - 87 files changed, 1961 deletions(-) delete mode 100644 src/test/pretty/asm.pp delete mode 100644 src/test/pretty/asm.rs delete mode 100644 src/test/pretty/ast-stmt-expr-attr.rs delete mode 100644 src/test/pretty/async.rs delete mode 100644 src/test/pretty/attr-derive.rs delete mode 100644 src/test/pretty/attr-fn-inner.rs delete mode 100644 src/test/pretty/attr-literals.rs delete mode 100644 src/test/pretty/attr-tokens-raw-ident.rs delete mode 100644 src/test/pretty/auto-trait.rs delete mode 100644 src/test/pretty/auxiliary/derive-foo.rs delete mode 100644 src/test/pretty/blank-lines.rs delete mode 100644 src/test/pretty/block-comment-multiple-asterisks.rs delete mode 100644 src/test/pretty/block-comment-trailing-whitespace.rs delete mode 100644 src/test/pretty/block-comment-trailing-whitespace2.rs delete mode 100644 src/test/pretty/block-comment-wchar.pp delete mode 100644 src/test/pretty/block-comment-wchar.rs delete mode 100644 src/test/pretty/block-disambig.rs delete mode 100644 src/test/pretty/cast-lt.pp delete mode 100644 src/test/pretty/cast-lt.rs delete mode 100644 src/test/pretty/closure-reform-pretty.rs delete mode 100644 src/test/pretty/delimited-token-groups.rs delete mode 100644 src/test/pretty/disamb-stmt-expr.rs delete mode 100644 src/test/pretty/do1.rs delete mode 100644 src/test/pretty/doc-comments.rs delete mode 100644 src/test/pretty/dollar-crate.pp delete mode 100644 src/test/pretty/dollar-crate.rs delete mode 100644 src/test/pretty/empty-impl.rs delete mode 100644 src/test/pretty/empty-lines.rs delete mode 100644 src/test/pretty/enum-variant-vis.rs delete mode 100644 src/test/pretty/example1.rs delete mode 100644 src/test/pretty/example2.pp delete mode 100644 src/test/pretty/example2.rs delete mode 100644 src/test/pretty/expanded-and-path-remap-80832.pp delete mode 100644 src/test/pretty/expanded-and-path-remap-80832.rs delete mode 100644 src/test/pretty/fn-return.rs delete mode 100644 src/test/pretty/fn-types.rs delete mode 100644 src/test/pretty/fn-variadic.rs delete mode 100644 src/test/pretty/for-comment.rs delete mode 100644 src/test/pretty/gat-bounds.rs delete mode 100644 src/test/pretty/hir-pretty-loop.pp delete mode 100644 src/test/pretty/hir-pretty-loop.rs delete mode 100644 src/test/pretty/if-attr.rs delete mode 100644 src/test/pretty/import-renames.rs delete mode 100644 src/test/pretty/issue-12590-a.rs delete mode 100644 src/test/pretty/issue-12590-b.rs delete mode 100644 src/test/pretty/issue-12590-c.pp delete mode 100644 src/test/pretty/issue-12590-c.rs delete mode 100644 src/test/pretty/issue-19077.rs delete mode 100644 src/test/pretty/issue-25031.rs delete mode 100644 src/test/pretty/issue-30731.rs delete mode 100644 src/test/pretty/issue-31073.pp delete mode 100644 src/test/pretty/issue-31073.rs delete mode 100644 src/test/pretty/issue-4264.pp delete mode 100644 src/test/pretty/issue-4264.rs delete mode 100644 src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs delete mode 100644 src/test/pretty/issue-73626.rs delete mode 100644 src/test/pretty/issue-74745.rs delete mode 100644 src/test/pretty/issue-85089.pp delete mode 100644 src/test/pretty/issue-85089.rs delete mode 100644 src/test/pretty/let.rs delete mode 100644 src/test/pretty/lifetime.rs delete mode 100644 src/test/pretty/macro.rs delete mode 100644 src/test/pretty/macro_rules.rs delete mode 100644 src/test/pretty/match-block-expr.rs delete mode 100644 src/test/pretty/match-naked-expr-medium.rs delete mode 100644 src/test/pretty/match-naked-expr.rs delete mode 100644 src/test/pretty/nested-item-vis-defaultness.rs delete mode 100644 src/test/pretty/path-type-bounds.rs delete mode 100644 src/test/pretty/qpath-associated-type-bound.rs delete mode 100644 src/test/pretty/raw-address-of.rs delete mode 100644 src/test/pretty/raw-str-nonexpr.rs delete mode 100644 src/test/pretty/stmt_expr_attributes.rs delete mode 100644 src/test/pretty/struct-pattern.rs delete mode 100644 src/test/pretty/struct-tuple.rs delete mode 100644 src/test/pretty/tag-blank-lines.rs delete mode 100644 src/test/pretty/tests-are-sorted.pp delete mode 100644 src/test/pretty/tests-are-sorted.rs delete mode 100644 src/test/pretty/top-level-doc-comments.rs delete mode 100644 src/test/pretty/trait-inner-attr.rs delete mode 100644 src/test/pretty/trait-polarity.rs delete mode 100644 src/test/pretty/trait-safety.rs delete mode 100644 src/test/pretty/unary-op-disambig.rs delete mode 100644 src/test/pretty/use-tree.rs delete mode 100644 src/test/pretty/vec-comments.pp delete mode 100644 src/test/pretty/vec-comments.rs delete mode 100644 src/test/pretty/where-clauses.rs delete mode 100644 src/test/pretty/yeet-expr.rs (limited to 'src/test/pretty') diff --git a/src/test/pretty/asm.pp b/src/test/pretty/asm.pp deleted file mode 100644 index 5eade2933..000000000 --- a/src/test/pretty/asm.pp +++ /dev/null @@ -1,34 +0,0 @@ -#![feature(prelude_import)] -#![no_std] -#[prelude_import] -use ::std::prelude::rust_2015::*; -#[macro_use] -extern crate std; -// pretty-mode:expanded -// pp-exact:asm.pp -// only-x86_64 - -use std::arch::asm; - -pub fn main() { - let a: i32; - let mut b = 4i32; - unsafe { - asm!(""); - asm!(""); - asm!("", options(nomem, nostack)); - asm!("{0}", in(reg) 4); - asm!("{0}", out(reg) a); - asm!("{0}", inout(reg) b); - asm!("{0} {1}", out(reg) _, inlateout(reg) b => _); - asm!("", out("al") _, lateout("rcx") _); - asm!("inst1\ninst2"); - asm!("inst1 {0}, 42\ninst2 {1}, 24", in(reg) a, out(reg) b); - asm!("inst2 {1}, 24\ninst1 {0}, 42", in(reg) a, out(reg) b); - asm!("inst1 {0}, 42\ninst2 {1}, 24", in(reg) a, out(reg) b); - asm!("inst1\ninst2"); - asm!("inst1\ninst2"); - asm!("inst1\n\tinst2"); - asm!("inst1\ninst2\ninst3\ninst4"); - } -} diff --git a/src/test/pretty/asm.rs b/src/test/pretty/asm.rs deleted file mode 100644 index 1a3f972c8..000000000 --- a/src/test/pretty/asm.rs +++ /dev/null @@ -1,31 +0,0 @@ -// pretty-mode:expanded -// pp-exact:asm.pp -// only-x86_64 - -use std::arch::asm; - -pub fn main() { - let a: i32; - let mut b = 4i32; - unsafe { - asm!(""); - asm!("", options()); - asm!("", options(nostack, nomem)); - asm!("{}", in(reg) 4); - asm!("{0}", out(reg) a); - asm!("{name}", name = inout(reg) b); - asm!("{} {}", out(reg) _, inlateout(reg) b => _); - asm!("", out("al") _, lateout("rcx") _); - asm!("inst1", "inst2"); - asm!("inst1 {}, 42", "inst2 {}, 24", in(reg) a, out(reg) b); - asm!("inst2 {1}, 24", "inst1 {0}, 42", in(reg) a, out(reg) b); - asm!("inst1 {}, 42", "inst2 {name}, 24", in(reg) a, name = out(reg) b); - asm!( - "inst1 -inst2" - ); - asm!("inst1\ninst2"); - asm!("inst1\n\tinst2"); - asm!("inst1\ninst2", "inst3\ninst4"); - } -} diff --git a/src/test/pretty/ast-stmt-expr-attr.rs b/src/test/pretty/ast-stmt-expr-attr.rs deleted file mode 100644 index 27c86ec22..000000000 --- a/src/test/pretty/ast-stmt-expr-attr.rs +++ /dev/null @@ -1,175 +0,0 @@ -// pp-exact - -fn main() {} - -#[cfg(FALSE)] -fn syntax() { - let _ = #[attr] box 0; - let _ = #[attr] []; - let _ = #[attr] [0]; - let _ = #[attr] [0; 0]; - let _ = #[attr] [0, 0, 0]; - let _ = #[attr] foo(); - let _ = #[attr] x.foo(); - let _ = #[attr] (); - let _ = #[attr] (#[attr] 0,); - let _ = #[attr] (#[attr] 0, 0); - let _ = #[attr] 0 + #[attr] 0; - let _ = #[attr] 0 / #[attr] 0; - let _ = #[attr] 0 & #[attr] 0; - let _ = #[attr] 0 % #[attr] 0; - let _ = #[attr] (0 + 0); - let _ = #[attr] !0; - let _ = #[attr] -0; - let _ = #[attr] false; - let _ = #[attr] 0; - let _ = #[attr] 'c'; - let _ = #[attr] x as Y; - let _ = #[attr] (x as Y); - let _ = - #[attr] while true { - #![attr] - }; - let _ = - #[attr] while let Some(false) = true { - #![attr] - }; - let _ = - #[attr] for x in y { - #![attr] - }; - let _ = - #[attr] loop { - #![attr] - }; - let _ = - #[attr] match true { - #![attr] - #[attr] - _ => false, - }; - let _ = #[attr] || #[attr] foo; - let _ = #[attr] move || #[attr] foo; - let _ = - #[attr] || - #[attr] { - #![attr] - foo - }; - let _ = - #[attr] move || - #[attr] { - #![attr] - foo - }; - let _ = - #[attr] || - { - #![attr] - foo - }; - let _ = - #[attr] move || - { - #![attr] - foo - }; - let _ = - #[attr] { - #![attr] - }; - let _ = - #[attr] { - #![attr] - let _ = (); - }; - let _ = - #[attr] { - #![attr] - let _ = (); - foo - }; - let _ = #[attr] x = y; - let _ = #[attr] (x = y); - let _ = #[attr] x += y; - let _ = #[attr] (x += y); - let _ = #[attr] foo.bar; - let _ = (#[attr] foo).bar; - let _ = #[attr] foo.0; - let _ = (#[attr] foo).0; - let _ = #[attr] foo[bar]; - let _ = (#[attr] foo)[bar]; - let _ = #[attr] 0..#[attr] 0; - let _ = #[attr] 0..; - let _ = #[attr] (0..0); - let _ = #[attr] (0..); - let _ = #[attr] (..0); - let _ = #[attr] (..); - let _ = #[attr] foo::bar::baz; - let _ = #[attr] &0; - let _ = #[attr] &mut 0; - let _ = #[attr] &#[attr] 0; - let _ = #[attr] &mut #[attr] 0; - let _ = #[attr] break; - let _ = #[attr] continue; - let _ = #[attr] return; - let _ = #[attr] foo!(); - let _ = #[attr] foo!(#! [attr]); - let _ = #[attr] foo![]; - let _ = #[attr] foo![#! [attr]]; - let _ = #[attr] foo! {}; - let _ = #[attr] foo! { #! [attr] }; - let _ = #[attr] Foo { bar: baz }; - let _ = #[attr] Foo { ..foo }; - let _ = #[attr] Foo { bar: baz, ..foo }; - let _ = #[attr] (0); - - { - #[attr] - let _ = 0; - - #[attr] - 0; - - #[attr] - foo!(); - - #[attr] - foo! {} - - #[attr] - foo![]; - } - - { - #[attr] - let _ = 0; - } - { - - #[attr] - 0 - } - { - - #[attr] - { - #![attr] - } - } - { - - #[attr] - foo!() - } - { - - #[attr] - foo![] - } - { - - #[attr] - foo! {} - } -} diff --git a/src/test/pretty/async.rs b/src/test/pretty/async.rs deleted file mode 100644 index 573e79bff..000000000 --- a/src/test/pretty/async.rs +++ /dev/null @@ -1,9 +0,0 @@ -// pp-exact -// pretty-compare-only -// edition:2021 - -async fn f() { - let first = async { 1 }; - let second = async move { 2 }; - join(first, second).await -} diff --git a/src/test/pretty/attr-derive.rs b/src/test/pretty/attr-derive.rs deleted file mode 100644 index 0eb403c6b..000000000 --- a/src/test/pretty/attr-derive.rs +++ /dev/null @@ -1,32 +0,0 @@ -// aux-build:derive-foo.rs -// pp-exact -// Testing that both the inner item and next outer item are -// preserved, and that the first outer item parsed in main is not -// accidentally carried over to each inner function - -#[macro_use] -extern crate derive_foo; - -#[derive(Foo)] -struct X; - -#[derive(Foo)] -#[Bar] -struct Y; - -#[derive(Foo)] -struct WithRef { - x: X, - #[Bar] - y: Y, -} - -#[derive(Foo)] -enum Enum { - - #[Bar] - Asdf, - Qwerty, -} - -fn main() {} diff --git a/src/test/pretty/attr-fn-inner.rs b/src/test/pretty/attr-fn-inner.rs deleted file mode 100644 index 6d9cb89f0..000000000 --- a/src/test/pretty/attr-fn-inner.rs +++ /dev/null @@ -1,16 +0,0 @@ -// Testing that both the inner item and next outer item are -// preserved, and that the first outer item parsed in main is not -// accidentally carried over to each inner function - -// pp-exact - -#![feature(rustc_attrs)] - -fn main() { - #![rustc_dummy] - #[rustc_dummy] - fn f() {} - - #[rustc_dummy] - fn g() {} -} diff --git a/src/test/pretty/attr-literals.rs b/src/test/pretty/attr-literals.rs deleted file mode 100644 index d13201442..000000000 --- a/src/test/pretty/attr-literals.rs +++ /dev/null @@ -1,14 +0,0 @@ -// Tests literals in attributes. - -// pp-exact - -#![feature(rustc_attrs)] - -fn main() { - #![rustc_dummy("hi", 1, 2, 1.012, pi = 3.14, bye, name("John"))] - #[rustc_dummy = 8] - fn f() {} - - #[rustc_dummy(1, 2, 3)] - fn g() {} -} diff --git a/src/test/pretty/attr-tokens-raw-ident.rs b/src/test/pretty/attr-tokens-raw-ident.rs deleted file mode 100644 index 8486342b0..000000000 --- a/src/test/pretty/attr-tokens-raw-ident.rs +++ /dev/null @@ -1,7 +0,0 @@ -// Keywords in attribute paths are printed as raw idents, -// but keywords in attribute arguments are not. - -// pp-exact - -#[rustfmt::r#final(final)] -fn main() {} diff --git a/src/test/pretty/auto-trait.rs b/src/test/pretty/auto-trait.rs deleted file mode 100644 index c3c47cff5..000000000 --- a/src/test/pretty/auto-trait.rs +++ /dev/null @@ -1,9 +0,0 @@ -#![feature(auto_traits)] - -// pp-exact - -auto trait MyTrait {} - -unsafe auto trait UnsafeMyTrait {} - -pub fn main() {} diff --git a/src/test/pretty/auxiliary/derive-foo.rs b/src/test/pretty/auxiliary/derive-foo.rs deleted file mode 100644 index 675a93b3d..000000000 --- a/src/test/pretty/auxiliary/derive-foo.rs +++ /dev/null @@ -1,13 +0,0 @@ -// force-host -// no-prefer-dynamic - -#![crate_type = "proc-macro"] - -extern crate proc_macro; - -use proc_macro::TokenStream; - -#[proc_macro_derive(Foo, attributes(Bar))] -pub fn derive(input: TokenStream) -> TokenStream { - "".parse().unwrap() -} diff --git a/src/test/pretty/blank-lines.rs b/src/test/pretty/blank-lines.rs deleted file mode 100644 index b9153d048..000000000 --- a/src/test/pretty/blank-lines.rs +++ /dev/null @@ -1,17 +0,0 @@ -// compile-flags: --crate-type=lib - -// pp-exact -fn f() -> [isize; 3] { - let picard = 0; - - let data = 1; - - let worf = 2; - - - let enterprise = [picard, data, worf]; - - - - return enterprise; -} diff --git a/src/test/pretty/block-comment-multiple-asterisks.rs b/src/test/pretty/block-comment-multiple-asterisks.rs deleted file mode 100644 index bb090b746..000000000 --- a/src/test/pretty/block-comment-multiple-asterisks.rs +++ /dev/null @@ -1,6 +0,0 @@ -// compile-flags: --crate-type=lib - -// pp-exact -/*** -More than two asterisks means that it isn't a doc comment. -*/ diff --git a/src/test/pretty/block-comment-trailing-whitespace.rs b/src/test/pretty/block-comment-trailing-whitespace.rs deleted file mode 100644 index 4d502f603..000000000 --- a/src/test/pretty/block-comment-trailing-whitespace.rs +++ /dev/null @@ -1,10 +0,0 @@ -// compile-flags: --crate-type=lib - -// pp-exact -fn f() { - /* - The next line should not be indented. - - That one. It shouldn't have been indented. - */ -} diff --git a/src/test/pretty/block-comment-trailing-whitespace2.rs b/src/test/pretty/block-comment-trailing-whitespace2.rs deleted file mode 100644 index e53d51e34..000000000 --- a/src/test/pretty/block-comment-trailing-whitespace2.rs +++ /dev/null @@ -1,8 +0,0 @@ -// compile-flags: --crate-type=lib - -// pp-exact -fn f() {} /* - The next line should not be indented. - - That one. It shouldn't have been indented. - */ diff --git a/src/test/pretty/block-comment-wchar.pp b/src/test/pretty/block-comment-wchar.pp deleted file mode 100644 index 8c8580b07..000000000 --- a/src/test/pretty/block-comment-wchar.pp +++ /dev/null @@ -1,101 +0,0 @@ -// This is meant as a test case for Issue 3961. -// -// Test via: rustc -Zunpretty normal src/test/pretty/block-comment-wchar.rs -// ignore-tidy-cr -// ignore-tidy-tab -// pp-exact:block-comment-wchar.pp -fn f() { - fn nested() { - /* - Spaced2 - */ - /* - Spaced10 - */ - /* - Tabbed8+2 - */ - /* - CR8+2 - */ - } - /* - Spaced2: (prefixed so start of space aligns with comment) - */ - /* - Tabbed2: (more indented b/c *start* of space will align with comment) - */ - /* - Spaced6: (Alignment removed and realigning spaces inserted) - */ - /* - Tabbed4+2: (Alignment removed and realigning spaces inserted) - */ - - /* - VT4+2: (should align) - */ - /* - FF4+2: (should align) - */ - /* - CR4+2: (should align) - */ - /* - NEL4+2: (should align) - */ - /* - Ogham Space Mark 4+2: (should align) - */ - /* - Ogham Space Mark 4+2: (should align) - */ - /* - Four-per-em space 4+2: (should align) - */ - - /* - Ogham Space Mark count 1: (should align) - Ogham Space Mark count 2: (should align) - Ogham Space Mark count 3: (should align) - Ogham Space Mark count 4: (should align) - Ogham Space Mark count 5: (should align) - Ogham Space Mark count 6: (should align) - Ogham Space Mark count 7: (should align) - Ogham Space Mark count 8: (should align) - Ogham Space Mark count 9: (should align) - Ogham Space Mark count A: (should align) - Ogham Space Mark count B: (should align) - Ogham Space Mark count C: (should align) - Ogham Space Mark count D: (should align) - Ogham Space Mark count E: (should align) - Ogham Space Mark count F: (should align) - */ - - - /* */ - - /* - Hello from offset 6 - Space 6+2: compare A - Ogham Space Mark 6+2: compare B - */ - /* */ - - /* - Hello from another offset 6 with wchars establishing column offset - Space 6+2: compare C - Ogham Space Mark 6+2: compare D - */ -} - -fn main() { - // Taken from https://www.unicode.org/Public/UNIDATA/PropList.txt - let chars = - ['\x0A', '\x0B', '\x0C', '\x0D', '\x20', '\u{85}', '\u{A0}', - '\u{1680}', '\u{2000}', '\u{2001}', '\u{2002}', '\u{2003}', - '\u{2004}', '\u{2005}', '\u{2006}', '\u{2007}', '\u{2008}', - '\u{2009}', '\u{200A}', '\u{2028}', '\u{2029}', '\u{202F}', - '\u{205F}', '\u{3000}']; - for c in &chars { let ws = c.is_whitespace(); println!("{} {}", c, ws); } -} diff --git a/src/test/pretty/block-comment-wchar.rs b/src/test/pretty/block-comment-wchar.rs deleted file mode 100644 index e0606e497..000000000 --- a/src/test/pretty/block-comment-wchar.rs +++ /dev/null @@ -1,100 +0,0 @@ -// This is meant as a test case for Issue 3961. -// -// Test via: rustc -Zunpretty normal src/test/pretty/block-comment-wchar.rs -// ignore-tidy-cr -// ignore-tidy-tab -// pp-exact:block-comment-wchar.pp -fn f() { - fn nested() { - /* - Spaced2 - */ - /* - Spaced10 - */ - /* - Tabbed8+2 - */ - /* - CR8+2 - */ - } - /* - Spaced2: (prefixed so start of space aligns with comment) - */ - /* - Tabbed2: (more indented b/c *start* of space will align with comment) - */ - /* - Spaced6: (Alignment removed and realigning spaces inserted) - */ - /* - Tabbed4+2: (Alignment removed and realigning spaces inserted) - */ - - /* - VT4+2: (should align) - */ - /* - FF4+2: (should align) - */ - /* - CR4+2: (should align) - */ - /* -………… NEL4+2: (should align) - */ - /* -     Ogham Space Mark 4+2: (should align) - */ - /* -     Ogham Space Mark 4+2: (should align) - */ - /* -     Four-per-em space 4+2: (should align) - */ - - /* -   Ogham Space Mark count 1: (should align) -   Ogham Space Mark count 2: (should align) -    Ogham Space Mark count 3: (should align) -   Ogham Space Mark count 4: (should align) -     Ogham Space Mark count 5: (should align) -    Ogham Space Mark count 6: (should align) -     Ogham Space Mark count 7: (should align) -  Ogham Space Mark count 8: (should align) -    Ogham Space Mark count 9: (should align) -    Ogham Space Mark count A: (should align) -     Ogham Space Mark count B: (should align) -   Ogham Space Mark count C: (should align) -     Ogham Space Mark count D: (should align) -    Ogham Space Mark count E: (should align) -     Ogham Space Mark count F: (should align) - */ - - -/* */ /* - Hello from offset 6 - Space 6+2: compare A -       Ogham Space Mark 6+2: compare B - */ -/* */ /* - Hello from another offset 6 with wchars establishing column offset - Space 6+2: compare C -       Ogham Space Mark 6+2: compare D - */ -} - -fn main() { - // Taken from https://www.unicode.org/Public/UNIDATA/PropList.txt - let chars = - ['\x0A', '\x0B', '\x0C', '\x0D', '\x20', '\u{85}', '\u{A0}', - '\u{1680}', '\u{2000}', '\u{2001}', '\u{2002}', '\u{2003}', - '\u{2004}', '\u{2005}', '\u{2006}', '\u{2007}', '\u{2008}', - '\u{2009}', '\u{200A}', '\u{2028}', '\u{2029}', '\u{202F}', - '\u{205F}', '\u{3000}']; - for c in &chars { - let ws = c.is_whitespace(); - println!("{} {}", c , ws); - } -} diff --git a/src/test/pretty/block-disambig.rs b/src/test/pretty/block-disambig.rs deleted file mode 100644 index ac9b84a5d..000000000 --- a/src/test/pretty/block-disambig.rs +++ /dev/null @@ -1,59 +0,0 @@ -// compile-flags: --crate-type=lib - -// A bunch of tests for syntactic forms involving blocks that were -// previously ambiguous (e.g., 'if true { } *val;' gets parsed as a -// binop) - - -use std::cell::Cell; - -fn test1() { let val = &0; { } *val; } - -fn test2() -> isize { let val = &0; { } *val } - -#[derive(Copy, Clone)] -struct S { eax: isize } - -fn test3() { - let regs = &Cell::new(S {eax: 0}); - match true { true => { } _ => { } } - regs.set(S {eax: 1}); -} - -fn test4() -> bool { let regs = &true; if true { } *regs || false } - -fn test5() -> (isize, isize) { { } (0, 1) } - -fn test6() -> bool { { } (true || false) && true } - -fn test7() -> usize { - let regs = &0; - match true { true => { } _ => { } } - (*regs < 2) as usize -} - -fn test8() -> isize { - let val = &0; - match true { - true => { } - _ => { } - } - if *val < 1 { - 0 - } else { - 1 - } -} - -fn test9() { - let regs = &Cell::new(0); - match true { true => { } _ => { } } regs.set(regs.get() + 1); -} - -fn test10() -> isize { - let regs = vec![0]; - match true { true => { } _ => { } } - regs[0] -} - -fn test11() -> Vec { if true { } vec![1, 2] } diff --git a/src/test/pretty/cast-lt.pp b/src/test/pretty/cast-lt.pp deleted file mode 100644 index e6c4d1956..000000000 --- a/src/test/pretty/cast-lt.pp +++ /dev/null @@ -1,13 +0,0 @@ -#![feature(prelude_import)] -#![no_std] -#[prelude_import] -use ::std::prelude::rust_2015::*; -#[macro_use] -extern crate std; -// pretty-compare-only -// pretty-mode:expanded -// pp-exact:cast-lt.pp - -macro_rules! negative { ($e : expr) => { $e < 0 } } - -fn main() { (1 as i32) < 0; } diff --git a/src/test/pretty/cast-lt.rs b/src/test/pretty/cast-lt.rs deleted file mode 100644 index e14bdd1f3..000000000 --- a/src/test/pretty/cast-lt.rs +++ /dev/null @@ -1,11 +0,0 @@ -// pretty-compare-only -// pretty-mode:expanded -// pp-exact:cast-lt.pp - -macro_rules! negative { - ($e:expr) => { $e < 0 } -} - -fn main() { - negative!(1 as i32); -} diff --git a/src/test/pretty/closure-reform-pretty.rs b/src/test/pretty/closure-reform-pretty.rs deleted file mode 100644 index 1eba1e6bd..000000000 --- a/src/test/pretty/closure-reform-pretty.rs +++ /dev/null @@ -1,16 +0,0 @@ -// Any copyright is dedicated to the Public Domain. -// http://creativecommons.org/publicdomain/zero/1.0/ - -// pp-exact - -fn call_it(f: Box String>) {} - -fn call_this(f: F) where F: Fn(&str) + Send {} - -fn call_that(f: F) where F: for<'a> Fn(&'a isize, &'a isize) -> isize {} - -fn call_extern(f: fn() -> isize) {} - -fn call_abid_extern(f: extern "C" fn() -> isize) {} - -pub fn main() {} diff --git a/src/test/pretty/delimited-token-groups.rs b/src/test/pretty/delimited-token-groups.rs deleted file mode 100644 index c7c9277fa..000000000 --- a/src/test/pretty/delimited-token-groups.rs +++ /dev/null @@ -1,48 +0,0 @@ -// pp-exact - -#![feature(rustc_attrs)] - -macro_rules! mac { ($($tt : tt) *) => () } - -mac! { - struct S { field1 : u8, field2 : u16, } impl Clone for S - { - fn clone() -> S - { - panic! () ; - - } - } -} - -mac! { - a(aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa - aaaaaaaa aaaaaaaa) a - [aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa - aaaaaaaa aaaaaaaa] a - { - aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa - aaaaaaaa aaaaaaaa aaaaaaaa - } a -} - -mac!(aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa -aaaaaaaa aaaaaaaa); -mac![aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa -aaaaaaaa aaaaaaaa]; -mac! { - aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa - aaaaaaaa aaaaaaaa -} - -#[rustc_dummy(aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa -aaaaaaaa aaaaaaaa aaaaaaaa)] -#[rustc_dummy[aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa -aaaaaaaa aaaaaaaa aaaaaaaa]] -#[rustc_dummy { - aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa - aaaaaaaa aaaaaaaa -}] -#[rustc_dummy = -"aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa"] -fn main() {} diff --git a/src/test/pretty/disamb-stmt-expr.rs b/src/test/pretty/disamb-stmt-expr.rs deleted file mode 100644 index 734f9fa12..000000000 --- a/src/test/pretty/disamb-stmt-expr.rs +++ /dev/null @@ -1,10 +0,0 @@ -// pp-exact - -// Here we check that the parentheses around the body of `wsucc()` are -// preserved. They are needed to disambiguate `{return n+1}; - 0` from -// `({return n+1}-0)`. - -fn id(f: F) -> isize where F: Fn() -> isize { f() } - -fn wsucc(_n: isize) -> isize { id(|| { 1 }) - 0 } -fn main() {} diff --git a/src/test/pretty/do1.rs b/src/test/pretty/do1.rs deleted file mode 100644 index 233ccdb00..000000000 --- a/src/test/pretty/do1.rs +++ /dev/null @@ -1,5 +0,0 @@ -// pp-exact - -fn f(f: F) where F: Fn(isize) { f(10) } - -fn main() { f(|i| { assert_eq!(i, 10) }) } diff --git a/src/test/pretty/doc-comments.rs b/src/test/pretty/doc-comments.rs deleted file mode 100644 index a49860daa..000000000 --- a/src/test/pretty/doc-comments.rs +++ /dev/null @@ -1,53 +0,0 @@ -// compile-flags: --crate-type=lib - -// pp-exact - -// some single-line non-doc comment - -/// some single line outer-docs -fn a() {} - -fn b() { - //! some single line inner-docs -} - -////////////////////////////////// -// some single-line non-doc comment preceded by a separator - -////////////////////////////////// -/// some single-line outer-docs preceded by a separator -/// (and trailing whitespaces) -fn c() {} - -/* - * some multi-line non-doc comment - */ - -/** - * some multi-line outer-docs - */ -fn d() {} - -fn e() { - /*! - * some multi-line inner-docs - */ -} - -/********************************/ -/* - * some multi-line non-doc comment preceded by a separator - */ - -/********************************/ -/** - * some multi-line outer-docs preceded by a separator - */ -fn f() {} - -#[doc = "unsugared outer doc-comments work also"] -fn g() {} - -fn h() { - #![doc = "as do inner ones"] -} diff --git a/src/test/pretty/dollar-crate.pp b/src/test/pretty/dollar-crate.pp deleted file mode 100644 index 3af37955f..000000000 --- a/src/test/pretty/dollar-crate.pp +++ /dev/null @@ -1,13 +0,0 @@ -#![feature(prelude_import)] -#![no_std] -#[prelude_import] -use ::std::prelude::rust_2015::*; -#[macro_use] -extern crate std; -// pretty-compare-only -// pretty-mode:expanded -// pp-exact:dollar-crate.pp - -fn main() { - { ::std::io::_print(::core::fmt::Arguments::new_v1(&["rust\n"], &[])); }; -} diff --git a/src/test/pretty/dollar-crate.rs b/src/test/pretty/dollar-crate.rs deleted file mode 100644 index e46bc7f48..000000000 --- a/src/test/pretty/dollar-crate.rs +++ /dev/null @@ -1,7 +0,0 @@ -// pretty-compare-only -// pretty-mode:expanded -// pp-exact:dollar-crate.pp - -fn main() { - println!("rust"); -} diff --git a/src/test/pretty/empty-impl.rs b/src/test/pretty/empty-impl.rs deleted file mode 100644 index d57093359..000000000 --- a/src/test/pretty/empty-impl.rs +++ /dev/null @@ -1,7 +0,0 @@ -// compile-flags: --crate-type=lib - -trait X { fn dummy(&self) { } } -impl X for usize { } - -trait Y { fn dummy(&self) { } } -impl Y for usize { } diff --git a/src/test/pretty/empty-lines.rs b/src/test/pretty/empty-lines.rs deleted file mode 100644 index 15d7625d4..000000000 --- a/src/test/pretty/empty-lines.rs +++ /dev/null @@ -1,9 +0,0 @@ -// compile-flags: --crate-type=lib - -// Issue #759 -// Whitespace under block opening should not expand forever - -fn a() -> usize { - - 1 -} diff --git a/src/test/pretty/enum-variant-vis.rs b/src/test/pretty/enum-variant-vis.rs deleted file mode 100644 index fc646c295..000000000 --- a/src/test/pretty/enum-variant-vis.rs +++ /dev/null @@ -1,8 +0,0 @@ -// pp-exact - -// Check that the visibility is printed on an enum variant. - -fn main() {} - -#[cfg(FALSE)] -enum Foo { pub V, } diff --git a/src/test/pretty/example1.rs b/src/test/pretty/example1.rs deleted file mode 100644 index 8df74e8e1..000000000 --- a/src/test/pretty/example1.rs +++ /dev/null @@ -1,3 +0,0 @@ -// pp-exact - -fn main() {} diff --git a/src/test/pretty/example2.pp b/src/test/pretty/example2.pp deleted file mode 100644 index 3f7129afd..000000000 --- a/src/test/pretty/example2.pp +++ /dev/null @@ -1,3 +0,0 @@ -// pp-exact:example2.pp - -fn main() {} diff --git a/src/test/pretty/example2.rs b/src/test/pretty/example2.rs deleted file mode 100644 index 3f7129afd..000000000 --- a/src/test/pretty/example2.rs +++ /dev/null @@ -1,3 +0,0 @@ -// pp-exact:example2.pp - -fn main() {} diff --git a/src/test/pretty/expanded-and-path-remap-80832.pp b/src/test/pretty/expanded-and-path-remap-80832.pp deleted file mode 100644 index 8385c5fa8..000000000 --- a/src/test/pretty/expanded-and-path-remap-80832.pp +++ /dev/null @@ -1,13 +0,0 @@ -#![feature(prelude_import)] -#![no_std] -#[prelude_import] -use ::std::prelude::rust_2015::*; -#[macro_use] -extern crate std; -// Test for issue 80832 -// -// pretty-mode:expanded -// pp-exact:expanded-and-path-remap-80832.pp -// compile-flags: --remap-path-prefix {{src-base}}=the/src - -fn main() {} diff --git a/src/test/pretty/expanded-and-path-remap-80832.rs b/src/test/pretty/expanded-and-path-remap-80832.rs deleted file mode 100644 index f48441fbc..000000000 --- a/src/test/pretty/expanded-and-path-remap-80832.rs +++ /dev/null @@ -1,7 +0,0 @@ -// Test for issue 80832 -// -// pretty-mode:expanded -// pp-exact:expanded-and-path-remap-80832.pp -// compile-flags: --remap-path-prefix {{src-base}}=the/src - -fn main() {} diff --git a/src/test/pretty/fn-return.rs b/src/test/pretty/fn-return.rs deleted file mode 100644 index b932e83aa..000000000 --- a/src/test/pretty/fn-return.rs +++ /dev/null @@ -1,7 +0,0 @@ -// pp-exact - -// Check that `fn f() -> () {}` does not print as `fn f() {}`. - -fn f() -> () {} - -fn main() {} diff --git a/src/test/pretty/fn-types.rs b/src/test/pretty/fn-types.rs deleted file mode 100644 index f012763c3..000000000 --- a/src/test/pretty/fn-types.rs +++ /dev/null @@ -1,5 +0,0 @@ -// pp-exact - -fn from_foreign_fn(_x: fn()) {} -fn from_stack_closure(_x: F) where F: Fn() {} -fn main() {} diff --git a/src/test/pretty/fn-variadic.rs b/src/test/pretty/fn-variadic.rs deleted file mode 100644 index 59e477cfa..000000000 --- a/src/test/pretty/fn-variadic.rs +++ /dev/null @@ -1,15 +0,0 @@ -// Check that `fn foo(x: i32, ...)` does not print as `fn foo(x: i32, ..., ...)`. -// See issue #58853. - -// pp-exact -#![feature(c_variadic)] - -extern "C" { - pub fn foo(x: i32, ...); -} - -pub unsafe extern "C" fn bar(_: i32, mut ap: ...) -> usize { - ap.arg::() -} - -fn main() {} diff --git a/src/test/pretty/for-comment.rs b/src/test/pretty/for-comment.rs deleted file mode 100644 index 447e7f918..000000000 --- a/src/test/pretty/for-comment.rs +++ /dev/null @@ -1,11 +0,0 @@ -// compile-flags: --crate-type=lib - -// pp-exact - -fn f(v: &[isize]) -> isize { - let mut n = 0; - for e in v { - n = *e; // This comment once triggered pretty printer bug - } - n -} diff --git a/src/test/pretty/gat-bounds.rs b/src/test/pretty/gat-bounds.rs deleted file mode 100644 index 0a361a383..000000000 --- a/src/test/pretty/gat-bounds.rs +++ /dev/null @@ -1,16 +0,0 @@ -// Check that associated types print generic parameters and where clauses. -// See issue #67509. - -// pretty-compare-only - -trait X { - type Y: Trait where Self: Sized; -} - -impl X for () { - type Y where Self: Sized = u32; -} - -fn f = i32>>() {} - -fn main() { } diff --git a/src/test/pretty/hir-pretty-loop.pp b/src/test/pretty/hir-pretty-loop.pp deleted file mode 100644 index a59a3002c..000000000 --- a/src/test/pretty/hir-pretty-loop.pp +++ /dev/null @@ -1,9 +0,0 @@ -#[prelude_import] -use ::std::prelude::rust_2015::*; -#[macro_use] -extern crate std; -// pretty-compare-only -// pretty-mode:hir -// pp-exact:hir-pretty-loop.pp - -fn foo() { loop { break; } } diff --git a/src/test/pretty/hir-pretty-loop.rs b/src/test/pretty/hir-pretty-loop.rs deleted file mode 100644 index 87a3ef8b8..000000000 --- a/src/test/pretty/hir-pretty-loop.rs +++ /dev/null @@ -1,9 +0,0 @@ -// pretty-compare-only -// pretty-mode:hir -// pp-exact:hir-pretty-loop.pp - -pub fn foo(){ - loop{ - break; - } -} diff --git a/src/test/pretty/if-attr.rs b/src/test/pretty/if-attr.rs deleted file mode 100644 index 7b90b0bec..000000000 --- a/src/test/pretty/if-attr.rs +++ /dev/null @@ -1,37 +0,0 @@ -// pp-exact - -#[cfg(FALSE)] -fn simple_attr() { - - #[attr] - if true {} - - #[allow_warnings] - if true {} -} - -#[cfg(FALSE)] -fn if_else_chain() { - - #[first_attr] - if true {} else if false {} else {} -} - -#[cfg(FALSE)] -fn if_let() { - - #[attr] - if let Some(_) = Some(true) {} -} - -#[cfg(FALSE)] -fn let_attr_if() { - let _ = #[attr] if let _ = 0 {}; - let _ = #[attr] if true {}; - - let _ = #[attr] if let _ = 0 {} else {}; - let _ = #[attr] if true {} else {}; -} - - -fn main() {} diff --git a/src/test/pretty/import-renames.rs b/src/test/pretty/import-renames.rs deleted file mode 100644 index ce6b5058b..000000000 --- a/src/test/pretty/import-renames.rs +++ /dev/null @@ -1,6 +0,0 @@ -// compile-flags: --crate-type=lib - -// pp-exact - -use std::io::{self, Error as IoError}; -use std::net::{self as stdnet, TcpStream}; diff --git a/src/test/pretty/issue-12590-a.rs b/src/test/pretty/issue-12590-a.rs deleted file mode 100644 index 3c88f5cb8..000000000 --- a/src/test/pretty/issue-12590-a.rs +++ /dev/null @@ -1,9 +0,0 @@ -// pp-exact -// pretty-compare-only - -// The next line should not be expanded - -#[path = "issue-12590-b.rs"] -mod issue_12590_b; - -fn main() {} diff --git a/src/test/pretty/issue-12590-b.rs b/src/test/pretty/issue-12590-b.rs deleted file mode 100644 index b14c7afa2..000000000 --- a/src/test/pretty/issue-12590-b.rs +++ /dev/null @@ -1,5 +0,0 @@ -// Second part of two-file test - -fn b() { } - -fn main() { } diff --git a/src/test/pretty/issue-12590-c.pp b/src/test/pretty/issue-12590-c.pp deleted file mode 100644 index 07b3f5653..000000000 --- a/src/test/pretty/issue-12590-c.pp +++ /dev/null @@ -1,19 +0,0 @@ -#![feature(prelude_import)] -#![no_std] -#[prelude_import] -use ::std::prelude::rust_2015::*; -#[macro_use] -extern crate std; -// pretty-compare-only -// pretty-mode:expanded -// pp-exact:issue-12590-c.pp - -// The next line should be expanded - -#[path = "issue-12590-b.rs"] -mod issue_12590_b { - - fn b() {} - fn main() {} -} -fn main() {} diff --git a/src/test/pretty/issue-12590-c.rs b/src/test/pretty/issue-12590-c.rs deleted file mode 100644 index 0ec05f9a8..000000000 --- a/src/test/pretty/issue-12590-c.rs +++ /dev/null @@ -1,10 +0,0 @@ -// pretty-compare-only -// pretty-mode:expanded -// pp-exact:issue-12590-c.pp - -// The next line should be expanded - -#[path = "issue-12590-b.rs"] -mod issue_12590_b; - -fn main() {} diff --git a/src/test/pretty/issue-19077.rs b/src/test/pretty/issue-19077.rs deleted file mode 100644 index 0d2702804..000000000 --- a/src/test/pretty/issue-19077.rs +++ /dev/null @@ -1,11 +0,0 @@ -// -// Testing that unsafe blocks in match arms are followed by a comma -// pp-exact -fn main() { - match true { - true if true => (), - false if false => unsafe {}, - true => {} - false => (), - } -} diff --git a/src/test/pretty/issue-25031.rs b/src/test/pretty/issue-25031.rs deleted file mode 100644 index d91494891..000000000 --- a/src/test/pretty/issue-25031.rs +++ /dev/null @@ -1,8 +0,0 @@ -// -// Testing that type items with where clauses output correctly. - -// pp-exact - -fn main() { - type Foo where T: Copy = Box; -} diff --git a/src/test/pretty/issue-30731.rs b/src/test/pretty/issue-30731.rs deleted file mode 100644 index 607cbebee..000000000 --- a/src/test/pretty/issue-30731.rs +++ /dev/null @@ -1,8 +0,0 @@ -// -// Test pretty printing of macro with braces but without terminating semicolon, -// this used to panic before fix. - -// pretty-compare-only -// pp-exact - -fn main() { b! {} c } diff --git a/src/test/pretty/issue-31073.pp b/src/test/pretty/issue-31073.pp deleted file mode 100644 index 75795f6d5..000000000 --- a/src/test/pretty/issue-31073.pp +++ /dev/null @@ -1,7 +0,0 @@ -// pp-exact:issue-31073.pp - -fn main() { - fn f1(x: i32, y: i32) -> i32 { y } - let f: fn(_, i32) -> i32 = f1; - f(1, 2); -} diff --git a/src/test/pretty/issue-31073.rs b/src/test/pretty/issue-31073.rs deleted file mode 100644 index 75795f6d5..000000000 --- a/src/test/pretty/issue-31073.rs +++ /dev/null @@ -1,7 +0,0 @@ -// pp-exact:issue-31073.pp - -fn main() { - fn f1(x: i32, y: i32) -> i32 { y } - let f: fn(_, i32) -> i32 = f1; - f(1, 2); -} diff --git a/src/test/pretty/issue-4264.pp b/src/test/pretty/issue-4264.pp deleted file mode 100644 index 18e6d75b1..000000000 --- a/src/test/pretty/issue-4264.pp +++ /dev/null @@ -1,57 +0,0 @@ -#[prelude_import] -use ::std::prelude::rust_2015::*; -#[macro_use] -extern crate std; -// pretty-compare-only -// pretty-mode:hir,typed -// pp-exact:issue-4264.pp - -// #4264 fixed-length vector types - -fn foo(_: [i32; (3 as usize)]) ({ } as ()) - -fn bar() ({ - const FOO: usize = ((5 as usize) - (4 as usize) as usize); - let _: [(); (FOO as usize)] = ([(() as ())] as [(); 1]); - - let _: [(); (1 as usize)] = ([(() as ())] as [(); 1]); - - let _ = - (((&([(1 as i32), (2 as i32), (3 as i32)] as [i32; 3]) as - &[i32; 3]) as *const _ as *const [i32; 3]) as - *const [i32; (3 as usize)] as *const [i32; 3]); - - - - - - - - - - ({ - let res = - ((::alloc::fmt::format as - for<'a> fn(Arguments<'a>) -> String {format})(((::core::fmt::Arguments::new_v1 - as - fn(&[&'static str], &[ArgumentV1<'_>]) -> Arguments<'_> {Arguments::<'_>::new_v1})((&([("test" - as &str)] as [&str; 1]) as &[&str; 1]), - (&([] as [ArgumentV1<'_>; 0]) as &[ArgumentV1<'_>; 0])) as - Arguments<'_>)) as String); - (res as String) - } as String); - } as ()) -type Foo = [i32; (3 as usize)]; -struct Bar { - x: [i32; (3 as usize)], -} -struct TupleBar([i32; (4 as usize)]); -enum Baz { BazVariant([i32; (5 as usize)]), } -fn id(x: T) -> T ({ (x as T) } as T) -fn use_id() ({ - let _ = - ((id::<[i32; (3 as usize)]> as - fn([i32; 3]) -> [i32; 3] {id::<[i32; 3]>})(([(1 as i32), - (2 as i32), (3 as i32)] as [i32; 3])) as [i32; 3]); - } as ()) -fn main() ({ } as ()) diff --git a/src/test/pretty/issue-4264.rs b/src/test/pretty/issue-4264.rs deleted file mode 100644 index 3dea81129..000000000 --- a/src/test/pretty/issue-4264.rs +++ /dev/null @@ -1,39 +0,0 @@ -// pretty-compare-only -// pretty-mode:hir,typed -// pp-exact:issue-4264.pp - -// #4264 fixed-length vector types - -pub fn foo(_: [i32; 3]) {} - -pub fn bar() { - const FOO: usize = 5 - 4; - let _: [(); FOO] = [()]; - - let _ : [(); 1] = [()]; - - let _ = &([1,2,3]) as *const _ as *const [i32; 3]; - - format!("test"); -} - -pub type Foo = [i32; 3]; - -pub struct Bar { - pub x: [i32; 3] -} - -pub struct TupleBar([i32; 4]); - -pub enum Baz { - BazVariant([i32; 5]) -} - -pub fn id(x: T) -> T { x } - -pub fn use_id() { - let _ = id::<[i32; 3]>([1,2,3]); -} - - -fn main() {} diff --git a/src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs b/src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs deleted file mode 100644 index 80f739f4f..000000000 --- a/src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs +++ /dev/null @@ -1,17 +0,0 @@ -// pp-exact - -fn main() {} - -struct C { - field: u8, -} - -#[allow()] -const C: C = - C { - #[cfg(debug_assertions)] - field: 0, - - #[cfg(not(debug_assertions))] - field: 1, - }; diff --git a/src/test/pretty/issue-73626.rs b/src/test/pretty/issue-73626.rs deleted file mode 100644 index a002f09be..000000000 --- a/src/test/pretty/issue-73626.rs +++ /dev/null @@ -1,34 +0,0 @@ -fn main(/* - --- -*/) { - let x /* this is one line */ = 3; - - let x /* - * this - * is - * multiple - * lines - */ = 3; - - let x = /* - * this - * is - * multiple - * lines - * after - * the - * = - */ 3; - - let x /* - * this - * is - * multiple - * lines - * including - * a - - * blank - * line - */ = 3; -} diff --git a/src/test/pretty/issue-74745.rs b/src/test/pretty/issue-74745.rs deleted file mode 100644 index e255cd6ca..000000000 --- a/src/test/pretty/issue-74745.rs +++ /dev/null @@ -1,5 +0,0 @@ -// ignore-tidy-trailing-newlines -// pretty-compare-only - -/* -*/ \ No newline at end of file diff --git a/src/test/pretty/issue-85089.pp b/src/test/pretty/issue-85089.pp deleted file mode 100644 index f84e9df04..000000000 --- a/src/test/pretty/issue-85089.pp +++ /dev/null @@ -1,20 +0,0 @@ -#[prelude_import] -use ::std::prelude::rust_2015::*; -#[macro_use] -extern crate std; -// Test to print lifetimes on HIR pretty-printing. - -// pretty-compare-only -// pretty-mode:hir -// pp-exact:issue-85089.pp - -trait A<'x> { } -trait B<'x> { } - -struct Foo<'b> { - bar: &'b dyn for<'a> A<'a>, -} - -impl <'a> B<'a> for dyn for<'b> A<'b> { } - -impl <'a> A<'a> for Foo<'a> { } diff --git a/src/test/pretty/issue-85089.rs b/src/test/pretty/issue-85089.rs deleted file mode 100644 index eb45d4731..000000000 --- a/src/test/pretty/issue-85089.rs +++ /dev/null @@ -1,16 +0,0 @@ -// Test to print lifetimes on HIR pretty-printing. - -// pretty-compare-only -// pretty-mode:hir -// pp-exact:issue-85089.pp - -trait A<'x> {} -trait B<'x> {} - -struct Foo<'b> { - pub bar: &'b dyn for<'a> A<'a>, -} - -impl<'a> B<'a> for dyn for<'b> A<'b> {} - -impl<'a> A<'a> for Foo<'a> {} diff --git a/src/test/pretty/let.rs b/src/test/pretty/let.rs deleted file mode 100644 index 20ffb7578..000000000 --- a/src/test/pretty/let.rs +++ /dev/null @@ -1,9 +0,0 @@ -// pp-exact - -// Check that `let x: _ = 0;` does not print as `let x = 0;`. - -fn main() { - let x: _ = 0; - - let _ = x; -} diff --git a/src/test/pretty/lifetime.rs b/src/test/pretty/lifetime.rs deleted file mode 100644 index 34eae849b..000000000 --- a/src/test/pretty/lifetime.rs +++ /dev/null @@ -1,5 +0,0 @@ -// pp-exact - -fn f1<'a, 'b, 'c>(_x: &'a u32, _y: &'b u32, _z: &'c u32) where 'c: 'a + 'b {} - -fn main() {} diff --git a/src/test/pretty/macro.rs b/src/test/pretty/macro.rs deleted file mode 100644 index b88ae7039..000000000 --- a/src/test/pretty/macro.rs +++ /dev/null @@ -1,7 +0,0 @@ -// pp-exact - -#![feature(decl_macro)] - -pub(crate) macro mac { ($arg : expr) => { $arg + $arg } } - -fn main() {} diff --git a/src/test/pretty/macro_rules.rs b/src/test/pretty/macro_rules.rs deleted file mode 100644 index 01adb1413..000000000 --- a/src/test/pretty/macro_rules.rs +++ /dev/null @@ -1,19 +0,0 @@ -// pp-exact - -macro_rules! brace { () => {} ; } - -macro_rules! bracket[() => {} ;]; - -macro_rules! paren(() => {} ;); - -macro_rules! matcher_brackets { - (paren) => {} ; (bracket) => {} ; (brace) => {} ; -} - -macro_rules! all_fragments { - ($b : block, $e : expr, $i : ident, $it : item, $l : lifetime, $lit : - literal, $m : meta, $p : pat, $pth : path, $s : stmt, $tt : tt, $ty : ty, - $vis : vis) => {} ; -} - -fn main() {} diff --git a/src/test/pretty/match-block-expr.rs b/src/test/pretty/match-block-expr.rs deleted file mode 100644 index 10903e928..000000000 --- a/src/test/pretty/match-block-expr.rs +++ /dev/null @@ -1,6 +0,0 @@ -// pp-exact - -fn main() { - let x = match { 5 } { 1 => 5, 2 => 6, _ => 7, }; - assert_eq!(x, 7); -} diff --git a/src/test/pretty/match-naked-expr-medium.rs b/src/test/pretty/match-naked-expr-medium.rs deleted file mode 100644 index 836af9900..000000000 --- a/src/test/pretty/match-naked-expr-medium.rs +++ /dev/null @@ -1,14 +0,0 @@ -// pp-exact - -fn main() { - let x = Some(3); - let _y = - match x { - Some(_) => - ["some(_)".to_string(), "not".to_string(), "SO".to_string(), - "long".to_string(), "string".to_string()], - None => - ["none".to_string(), "a".to_string(), "a".to_string(), - "a".to_string(), "a".to_string()], - }; -} diff --git a/src/test/pretty/match-naked-expr.rs b/src/test/pretty/match-naked-expr.rs deleted file mode 100644 index 7c16bbefe..000000000 --- a/src/test/pretty/match-naked-expr.rs +++ /dev/null @@ -1,10 +0,0 @@ -// pp-exact - -fn main() { - let x = Some(3); - let _y = - match x { - Some(_) => "some(_)".to_string(), - None => "none".to_string(), - }; -} diff --git a/src/test/pretty/nested-item-vis-defaultness.rs b/src/test/pretty/nested-item-vis-defaultness.rs deleted file mode 100644 index b094ba577..000000000 --- a/src/test/pretty/nested-item-vis-defaultness.rs +++ /dev/null @@ -1,47 +0,0 @@ -// Check that nested items have their visibility and `default`nesses in the right order. - -// pp-exact - -fn main() {} - -#[cfg(FALSE)] -extern "C" { - static X: u8; - type X; - fn foo(); - pub static X: u8; - pub type X; - pub fn foo(); -} - -#[cfg(FALSE)] -trait T { - const X: u8; - type X; - fn foo(); - default const X: u8; - default type X; - default fn foo(); - pub const X: u8; - pub type X; - pub fn foo(); - pub default const X: u8; - pub default type X; - pub default fn foo(); -} - -#[cfg(FALSE)] -impl T for S { - const X: u8; - type X; - fn foo(); - default const X: u8; - default type X; - default fn foo(); - pub const X: u8; - pub type X; - pub fn foo(); - pub default const X: u8; - pub default type X; - pub default fn foo(); -} diff --git a/src/test/pretty/path-type-bounds.rs b/src/test/pretty/path-type-bounds.rs deleted file mode 100644 index f1970de6f..000000000 --- a/src/test/pretty/path-type-bounds.rs +++ /dev/null @@ -1,15 +0,0 @@ -// pp-exact - - -trait Tr { - fn dummy(&self) {} -} -impl Tr for isize {} - -fn foo<'a>(x: Box) -> Box { x } - -fn main() { - let x: Box; - - Box::new(1isize) as Box; -} diff --git a/src/test/pretty/qpath-associated-type-bound.rs b/src/test/pretty/qpath-associated-type-bound.rs deleted file mode 100644 index 67a5d1dd8..000000000 --- a/src/test/pretty/qpath-associated-type-bound.rs +++ /dev/null @@ -1,16 +0,0 @@ -// pp-exact - - -mod m { - pub trait Tr { - type Ts: super::Tu; - } -} - -trait Tu { - fn dummy() {} -} - -fn foo() { ::Ts::dummy(); } - -fn main() {} diff --git a/src/test/pretty/raw-address-of.rs b/src/test/pretty/raw-address-of.rs deleted file mode 100644 index 6ccc434a1..000000000 --- a/src/test/pretty/raw-address-of.rs +++ /dev/null @@ -1,12 +0,0 @@ -// pp-exact -#![feature(raw_ref_op)] - -const C_PTR: () = { let a = 1; &raw const a; }; -static S_PTR: () = { let b = false; &raw const b; }; - -fn main() { - let x = 123; - let mut y = 345; - let c_p = &raw const x; - let parens = unsafe { *(&raw mut (y)) }; -} diff --git a/src/test/pretty/raw-str-nonexpr.rs b/src/test/pretty/raw-str-nonexpr.rs deleted file mode 100644 index 12440b5ae..000000000 --- a/src/test/pretty/raw-str-nonexpr.rs +++ /dev/null @@ -1,9 +0,0 @@ -// needs-asm-support -// pp-exact - -#[cfg(foo = r#"just parse this"#)] -extern crate blah as blah; - -use std::arch::asm; - -fn main() { unsafe { asm!(r###"blah"###); } } diff --git a/src/test/pretty/stmt_expr_attributes.rs b/src/test/pretty/stmt_expr_attributes.rs deleted file mode 100644 index c01379065..000000000 --- a/src/test/pretty/stmt_expr_attributes.rs +++ /dev/null @@ -1,271 +0,0 @@ -// pp-exact - -#![feature(box_syntax)] -#![feature(inline_const)] -#![feature(inline_const_pat)] -#![feature(rustc_attrs)] -#![feature(stmt_expr_attributes)] - -fn main() {} - -fn _0() { - - #[rustc_dummy] - foo(); -} - -fn _1() { - - #[rustc_dummy] - unsafe { - #![rustc_dummy] - // code - } -} - -fn _2() { - - #[rustc_dummy] - { foo(); } - - { - #![rustc_dummy] - - foo() - } -} - -fn _3() { - - #[rustc_dummy] - match () { _ => {} } -} - -fn _4() { - - #[rustc_dummy] - match () { - #![rustc_dummy] - _ => (), - } - - let _ = - #[rustc_dummy] match () { - #![rustc_dummy] - () => (), - }; -} - -fn _5() { - - #[rustc_dummy] - let x = 1; - - let x = #[rustc_dummy] 1; - - let y = (); - let z = (); - - foo3(x, #[rustc_dummy] y, z); - - qux(3 + #[rustc_dummy] 2); -} - -fn _6() { - - #[rustc_dummy] - [1, 2, 3]; - - let _ = #[rustc_dummy] [1, 2, 3]; - - #[rustc_dummy] - [1; 4]; - - let _ = #[rustc_dummy] [1; 4]; -} - -struct Foo { - data: (), -} - -struct Bar(()); - -fn _7() { - - #[rustc_dummy] - Foo { data: () }; - - let _ = #[rustc_dummy] Foo { data: () }; -} - -fn _8() { - - #[rustc_dummy] - (); - - #[rustc_dummy] - (0); - - #[rustc_dummy] - (0,); - - #[rustc_dummy] - (0, 1); -} - -fn _9() { - macro_rules! stmt_mac { () => { let _ = () ; } } - - #[rustc_dummy] - stmt_mac!(); - - #[rustc_dummy] - stmt_mac! {}; - - #[rustc_dummy] - stmt_mac![]; - - #[rustc_dummy] - stmt_mac! {} - - let _ = (); -} - -macro_rules! expr_mac { () => { () } } - -fn _10() { - let _ = #[rustc_dummy] expr_mac!(); - let _ = #[rustc_dummy] expr_mac![]; - let _ = #[rustc_dummy] expr_mac! {}; -} - -fn _11() { - let _ = #[rustc_dummy] box 0; - let _: [(); 0] = #[rustc_dummy] []; - let _ = #[rustc_dummy] [0, 0]; - let _ = #[rustc_dummy] [0; 0]; - let _ = #[rustc_dummy] foo(); - let _ = #[rustc_dummy] 1i32.clone(); - let _ = #[rustc_dummy] (); - let _ = #[rustc_dummy] (0); - let _ = #[rustc_dummy] (0,); - let _ = #[rustc_dummy] (0, 0); - let _ = #[rustc_dummy] 0 + #[rustc_dummy] 0; - let _ = #[rustc_dummy] !0; - let _ = #[rustc_dummy] -0i32; - let _ = #[rustc_dummy] false; - let _ = #[rustc_dummy] 'c'; - let _ = #[rustc_dummy] 0; - let _ = #[rustc_dummy] 0 as usize; - let _ = - #[rustc_dummy] while false { - #![rustc_dummy] - }; - let _ = - #[rustc_dummy] while let None = Some(()) { - #![rustc_dummy] - }; - let _ = - #[rustc_dummy] for _ in 0..0 { - #![rustc_dummy] - }; - let _ = - #[rustc_dummy] loop { - #![rustc_dummy] - }; - let _ = - #[rustc_dummy] match false { - #![rustc_dummy] - _ => (), - }; - let _ = #[rustc_dummy] || #[rustc_dummy] (); - let _ = #[rustc_dummy] move || #[rustc_dummy] (); - let _ = - #[rustc_dummy] || - { - #![rustc_dummy] - #[rustc_dummy] - () - }; - let _ = - #[rustc_dummy] move || - { - #![rustc_dummy] - #[rustc_dummy] - () - }; - let _ = - #[rustc_dummy] { - #![rustc_dummy] - }; - let _ = - #[rustc_dummy] { - #![rustc_dummy] - let _ = (); - }; - let _ = - #[rustc_dummy] { - #![rustc_dummy] - let _ = (); - () - }; - let const { - #![rustc_dummy] - } = - #[rustc_dummy] const { - #![rustc_dummy] - }; - let mut x = 0; - let _ = #[rustc_dummy] x = 15; - let _ = #[rustc_dummy] x += 15; - let s = Foo { data: () }; - let _ = #[rustc_dummy] s.data; - let _ = (#[rustc_dummy] s).data; - let t = Bar(()); - let _ = #[rustc_dummy] t.0; - let _ = (#[rustc_dummy] t).0; - let v = vec!(0); - let _ = #[rustc_dummy] v[0]; - let _ = (#[rustc_dummy] v)[0]; - let _ = #[rustc_dummy] 0..#[rustc_dummy] 0; - let _ = #[rustc_dummy] 0..; - let _ = #[rustc_dummy] (0..0); - let _ = #[rustc_dummy] (0..); - let _ = #[rustc_dummy] (..0); - let _ = #[rustc_dummy] (..); - let _: fn(&u32) -> u32 = #[rustc_dummy] std::clone::Clone::clone; - let _ = #[rustc_dummy] &0; - let _ = #[rustc_dummy] &mut 0; - let _ = #[rustc_dummy] &#[rustc_dummy] 0; - let _ = #[rustc_dummy] &mut #[rustc_dummy] 0; - while false { let _ = #[rustc_dummy] continue; } - while true { let _ = #[rustc_dummy] break; } - || #[rustc_dummy] return; - let _ = #[rustc_dummy] expr_mac!(); - let _ = #[rustc_dummy] expr_mac![]; - let _ = #[rustc_dummy] expr_mac! {}; - let _ = #[rustc_dummy] Foo { data: () }; - let _ = #[rustc_dummy] Foo { ..s }; - let _ = #[rustc_dummy] Foo { data: (), ..s }; - let _ = #[rustc_dummy] (0); -} - -fn _12() { - #[rustc_dummy] - let _ = 0; - - #[rustc_dummy] - 0; - - #[rustc_dummy] - expr_mac!(); - - #[rustc_dummy] - { - #![rustc_dummy] - } -} - -fn foo() {} -fn foo3(_: i32, _: (), _: ()) {} -fn qux(_: i32) {} diff --git a/src/test/pretty/struct-pattern.rs b/src/test/pretty/struct-pattern.rs deleted file mode 100644 index 6acb2e27f..000000000 --- a/src/test/pretty/struct-pattern.rs +++ /dev/null @@ -1,5 +0,0 @@ -// pp-exact -// pretty-compare-only -// Testing that shorthand struct patterns are preserved - -fn main() { let Foo { a, ref b, mut c, x: y, z: z } = foo; } diff --git a/src/test/pretty/struct-tuple.rs b/src/test/pretty/struct-tuple.rs deleted file mode 100644 index 77e064b4f..000000000 --- a/src/test/pretty/struct-tuple.rs +++ /dev/null @@ -1,10 +0,0 @@ -// pp-exact -struct Foo; -struct Bar(isize, isize); - -fn main() { - struct Foo2; - struct Bar2(isize, isize, isize); - let _a = Bar(5, 5); - let _b = Foo; -} diff --git a/src/test/pretty/tag-blank-lines.rs b/src/test/pretty/tag-blank-lines.rs deleted file mode 100644 index d53f6e4b5..000000000 --- a/src/test/pretty/tag-blank-lines.rs +++ /dev/null @@ -1,8 +0,0 @@ -// pp-exact - -enum foo { - bar, // a bar. - baz, -} - -fn main() {} diff --git a/src/test/pretty/tests-are-sorted.pp b/src/test/pretty/tests-are-sorted.pp deleted file mode 100644 index 15dcd4ed9..000000000 --- a/src/test/pretty/tests-are-sorted.pp +++ /dev/null @@ -1,69 +0,0 @@ -#![feature(prelude_import)] -#![no_std] -#[prelude_import] -use ::std::prelude::rust_2015::*; -#[macro_use] -extern crate std; -// compile-flags: --crate-type=lib --test -// pretty-compare-only -// pretty-mode:expanded -// pp-exact:tests-are-sorted.pp - -extern crate test; -#[cfg(test)] -#[rustc_test_marker = "m_test"] -pub const m_test: test::TestDescAndFn = - test::TestDescAndFn { - desc: test::TestDesc { - name: test::StaticTestName("m_test"), - ignore: false, - ignore_message: ::core::option::Option::None, - compile_fail: false, - no_run: false, - should_panic: test::ShouldPanic::No, - test_type: test::TestType::Unknown, - }, - testfn: test::StaticTestFn(|| test::assert_test_result(m_test())), - }; -fn m_test() {} - -extern crate test; -#[cfg(test)] -#[rustc_test_marker = "z_test"] -pub const z_test: test::TestDescAndFn = - test::TestDescAndFn { - desc: test::TestDesc { - name: test::StaticTestName("z_test"), - ignore: false, - ignore_message: ::core::option::Option::None, - compile_fail: false, - no_run: false, - should_panic: test::ShouldPanic::No, - test_type: test::TestType::Unknown, - }, - testfn: test::StaticTestFn(|| test::assert_test_result(z_test())), - }; -fn z_test() {} - -extern crate test; -#[cfg(test)] -#[rustc_test_marker = "a_test"] -pub const a_test: test::TestDescAndFn = - test::TestDescAndFn { - desc: test::TestDesc { - name: test::StaticTestName("a_test"), - ignore: false, - ignore_message: ::core::option::Option::None, - compile_fail: false, - no_run: false, - should_panic: test::ShouldPanic::No, - test_type: test::TestType::Unknown, - }, - testfn: test::StaticTestFn(|| test::assert_test_result(a_test())), - }; -fn a_test() {} -#[rustc_main] -pub fn main() -> () { - extern crate test; - test::test_main_static(&[&a_test, &m_test, &z_test]) -} diff --git a/src/test/pretty/tests-are-sorted.rs b/src/test/pretty/tests-are-sorted.rs deleted file mode 100644 index 1f737d547..000000000 --- a/src/test/pretty/tests-are-sorted.rs +++ /dev/null @@ -1,13 +0,0 @@ -// compile-flags: --crate-type=lib --test -// pretty-compare-only -// pretty-mode:expanded -// pp-exact:tests-are-sorted.pp - -#[test] -fn m_test() {} - -#[test] -fn z_test() {} - -#[test] -fn a_test() {} diff --git a/src/test/pretty/top-level-doc-comments.rs b/src/test/pretty/top-level-doc-comments.rs deleted file mode 100644 index b97927124..000000000 --- a/src/test/pretty/top-level-doc-comments.rs +++ /dev/null @@ -1,8 +0,0 @@ -/// Some doc comment. -struct X; - -// pp-exact - -// Test that rust can properly pretty print a doc comment if it's the first line in a file. some - -fn main() { let x = X; } diff --git a/src/test/pretty/trait-inner-attr.rs b/src/test/pretty/trait-inner-attr.rs deleted file mode 100644 index 6cb0e4136..000000000 --- a/src/test/pretty/trait-inner-attr.rs +++ /dev/null @@ -1,7 +0,0 @@ -// pp-exact - -trait Foo { - #![allow(bar)] -} - -fn main() {} diff --git a/src/test/pretty/trait-polarity.rs b/src/test/pretty/trait-polarity.rs deleted file mode 100644 index 310506eab..000000000 --- a/src/test/pretty/trait-polarity.rs +++ /dev/null @@ -1,9 +0,0 @@ -#![feature(negative_impls)] - -// pp-exact - -struct Test; - -impl !Send for Test {} - -pub fn main() {} diff --git a/src/test/pretty/trait-safety.rs b/src/test/pretty/trait-safety.rs deleted file mode 100644 index c4ae76069..000000000 --- a/src/test/pretty/trait-safety.rs +++ /dev/null @@ -1,15 +0,0 @@ -// pp-exact - -unsafe trait UnsafeTrait { - fn foo(&self); -} - -unsafe impl UnsafeTrait for isize { - fn foo(&self) {} -} - -pub unsafe trait PubUnsafeTrait { - fn foo(&self); -} - -fn main() {} diff --git a/src/test/pretty/unary-op-disambig.rs b/src/test/pretty/unary-op-disambig.rs deleted file mode 100644 index 0c57e0a33..000000000 --- a/src/test/pretty/unary-op-disambig.rs +++ /dev/null @@ -1,19 +0,0 @@ -// compile-flags: --crate-type=lib - -// Preserve semicolons that disambiguate unops - -fn f() { } - -fn block_semi() -> isize { { f() }; -1 } - -fn block_nosemi() -> isize { ({ 0 }) - 1 } - -fn if_semi() -> isize { if true { f() } else { f() }; -1 } - -fn if_nosemi() -> isize { (if true { 0 } else { 0 }) - 1 } - -fn alt_semi() -> isize { match true { true => { f() } _ => { } }; -1 } - -fn alt_no_semi() -> isize { (match true { true => { 0 } _ => { 1 } }) - 1 } - -fn stmt() { { f() }; -1; } diff --git a/src/test/pretty/use-tree.rs b/src/test/pretty/use-tree.rs deleted file mode 100644 index 5da952352..000000000 --- a/src/test/pretty/use-tree.rs +++ /dev/null @@ -1,23 +0,0 @@ -// pp-exact -// edition:2021 - -#![allow(unused_imports)] - -use ::std::fmt::{self, Debug, Display, Write as _}; - -use core::option::Option::*; - -use core::{ - cmp::{Eq, Ord, PartialEq, PartialOrd}, - convert::{AsMut, AsRef, From, Into}, - iter::{ - DoubleEndedIterator, ExactSizeIterator, Extend, FromIterator, - IntoIterator, Iterator, - }, - marker::{ - Copy as Copy, Send as Send, Sized as Sized, Sync as Sync, Unpin as U, - }, - ops::{*, Drop, Fn, FnMut, FnOnce}, -}; - -fn main() {} diff --git a/src/test/pretty/vec-comments.pp b/src/test/pretty/vec-comments.pp deleted file mode 100644 index f2f807c59..000000000 --- a/src/test/pretty/vec-comments.pp +++ /dev/null @@ -1,29 +0,0 @@ -// Issue #679 -// Testing that comments are correctly interleaved -// pp-exact:vec-comments.pp -fn main() { - let _v1 = - [ - // Comment - 0, - // Comment - 1, - // Comment - 2]; - let _v2 = - [0, // Comment - 1, // Comment - 2]; // Comment - let _v3 = - [ - /* Comment */ - 0, - /* Comment */ - 1, - /* Comment */ - 2]; - let _v4 = - [0, /* Comment */ - 1, /* Comment */ - 2]; /* Comment */ -} diff --git a/src/test/pretty/vec-comments.rs b/src/test/pretty/vec-comments.rs deleted file mode 100644 index a150cf0b8..000000000 --- a/src/test/pretty/vec-comments.rs +++ /dev/null @@ -1,29 +0,0 @@ -// Issue #679 -// Testing that comments are correctly interleaved -// pp-exact:vec-comments.pp -fn main() { - let _v1 = - [ - // Comment - 0, - // Comment - 1, - // Comment - 2]; - let _v2 = - [0, // Comment - 1, // Comment - 2]; // Comment - let _v3 = - [ - /* Comment */ - 0, - /* Comment */ - 1, - /* Comment */ - 2]; - let _v4 = - [0, /* Comment */ - 1, /* Comment */ - 2]; /* Comment */ -} diff --git a/src/test/pretty/where-clauses.rs b/src/test/pretty/where-clauses.rs deleted file mode 100644 index 418379945..000000000 --- a/src/test/pretty/where-clauses.rs +++ /dev/null @@ -1,8 +0,0 @@ -// pp-exact - -fn f<'a, 'b, T>(t: T) -> isize where T: 'a, 'a: 'b, T: Eq { 0 } - -// This is legal syntax, sometimes generated by macros. `where T: $($bound+)*` -fn zero_bounds<'a, T>() where 'a:, T: {} - -fn main() {} diff --git a/src/test/pretty/yeet-expr.rs b/src/test/pretty/yeet-expr.rs deleted file mode 100644 index c899f11b7..000000000 --- a/src/test/pretty/yeet-expr.rs +++ /dev/null @@ -1,12 +0,0 @@ -// pp-exact -#![feature(yeet_expr)] - -fn yeet_no_expr() -> Option { do yeet } - -fn yeet_no_expr_with_semicolon() -> Option { do yeet; } - -fn yeet_with_expr() -> Result { do yeet 1 + 2 } - -fn yeet_with_expr_with_semicolon() -> Result { do yeet 1 + 2; } - -fn main() {} -- cgit v1.2.3