From fc3ecb22b9b7131ab0150672b4117ba9b53306fa Mon Sep 17 00:00:00 2001
From: Chris Simpkins <git.simpkins@gmail.com>
Date: Mon, 10 Feb 2020 12:03:49 -0500
Subject: add issue 69017 test

---
 src/test/ui/generator/issue-69017.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/test/ui/generator/issue-69017.rs

(limited to 'src/test')

diff --git a/src/test/ui/generator/issue-69017.rs b/src/test/ui/generator/issue-69017.rs
new file mode 100644
index 00000000000..7b1d87efc94
--- /dev/null
+++ b/src/test/ui/generator/issue-69017.rs
@@ -0,0 +1,16 @@
+// This issue reproduces an ICE on compile
+// Fails on 2020-02-08 nightly
+// regressed commit: https://github.com/rust-lang/rust/commit/f8fd4624474a68bd26694eff3536b9f3a127b2d3
+//
+// check-pass
+
+#![feature(generator_trait)]
+#![feature(generators)]
+
+use std::ops::Generator;
+
+fn gen() -> impl Generator<usize> {
+    |_: usize| {
+        println!("-> {}", yield);
+    }
+}
-- 
cgit 1.4.1-3-g733a5


From 53b16fb5f2dad5571dc242c3671c1d0588183cb3 Mon Sep 17 00:00:00 2001
From: Chris Simpkins <git.simpkins@gmail.com>
Date: Mon, 10 Feb 2020 13:47:52 -0500
Subject: add main function to issue-69017 test

---
 src/test/ui/generator/issue-69017.rs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/test')

diff --git a/src/test/ui/generator/issue-69017.rs b/src/test/ui/generator/issue-69017.rs
index 7b1d87efc94..511deb60e45 100644
--- a/src/test/ui/generator/issue-69017.rs
+++ b/src/test/ui/generator/issue-69017.rs
@@ -14,3 +14,5 @@ fn gen() -> impl Generator<usize> {
         println!("-> {}", yield);
     }
 }
+
+fn main() {}
-- 
cgit 1.4.1-3-g733a5


From 090a1571d8c489588e2947ddb61b79f78b5b11b3 Mon Sep 17 00:00:00 2001
From: Jane Lusby <jlusby@yaah.dev>
Date: Tue, 11 Feb 2020 16:57:22 -0800
Subject: Fix failing backtrace ui tests

---
 src/libstd/sys_common/backtrace.rs | 1 +
 src/test/ui/std-backtrace.rs       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/test')

diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs
index 191add2c31b..289ee07babf 100644
--- a/src/libstd/sys_common/backtrace.rs
+++ b/src/libstd/sys_common/backtrace.rs
@@ -70,6 +70,7 @@ unsafe fn _print_fmt(fmt: &mut fmt::Formatter<'_>, print_fmt: PrintFmt) -> fmt::
     let mut print_path = move |fmt: &mut fmt::Formatter<'_>, bows: BytesOrWideString<'_>| {
         output_filename(fmt, bows, print_fmt, cwd.as_ref())
     };
+    write!(fmt, "stack backtrace:\n")?;
     let mut bt_fmt = BacktraceFmt::new(fmt, print_fmt, &mut print_path);
     bt_fmt.add_context()?;
     let mut idx = 0;
diff --git a/src/test/ui/std-backtrace.rs b/src/test/ui/std-backtrace.rs
index d84c493d535..902a2b6f5a0 100644
--- a/src/test/ui/std-backtrace.rs
+++ b/src/test/ui/std-backtrace.rs
@@ -16,9 +16,9 @@ use std::str;
 fn main() {
     let args: Vec<String> = env::args().collect();
     if args.len() >= 2 && args[1] == "force" {
-        println!("{}", std::backtrace::Backtrace::force_capture());
+        println!("stack backtrace:\n{}", std::backtrace::Backtrace::force_capture());
     } else if args.len() >= 2 {
-        println!("{}", std::backtrace::Backtrace::capture());
+        println!("stack backtrace:\n{}", std::backtrace::Backtrace::capture());
     } else {
         runtest(&args[0]);
         println!("test ok");
-- 
cgit 1.4.1-3-g733a5