about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-08-02 15:34:21 +0000
committerbors <bors@rust-lang.org>2018-08-02 15:34:21 +0000
commit03da14ba8cd22acbcfe1cca617f6c274999e5e9e (patch)
treea33c2439348b38fceebbf1fc4604e06066c5e8a0 /src/test
parent5e92bf280b59fe0c187359743d7d430575fa30b1 (diff)
parent683a3db01fcd00998a36e494ee39209b3105cfb9 (diff)
Auto merge of #52949 - Mark-Simulacrum:snap, r=alexcrichton
Switch to bootstrapping from 1.29 beta

r? @alexcrichton
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/macros/trace-macro.stderr5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/test/ui/macros/trace-macro.stderr b/src/test/ui/macros/trace-macro.stderr
index 2a30d983751..4b716ff2744 100644
--- a/src/test/ui/macros/trace-macro.stderr
+++ b/src/test/ui/macros/trace-macro.stderr
@@ -5,8 +5,5 @@ LL |     println!("Hello, World!");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: expanding `println! { "Hello, World!" }`
-   = note: to `{
-           # [ cfg ( not ( stage0 ) ) ] {
-           ( $crate :: io :: _print ( format_args_nl ! ( "Hello, World!" ) ) ) ; } # [
-           cfg ( stage0 ) ] { print ! ( "{}/n" , format_args ! ( "Hello, World!" ) ) } }`
+   = note: to `{ $crate :: io :: _print ( format_args_nl ! ( "Hello, World!" ) ) ; }`