diff options
| author | bors <bors@rust-lang.org> | 2020-02-12 16:25:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-12 16:25:13 +0000 |
| commit | 2d2be570970d784db5539a1d309cd22b85be910a (patch) | |
| tree | 52c9407b54a2b5c06af608699528a311406a4e78 /src/test | |
| parent | 2ed25f069768c046464e68fd382c867ddb04a1e3 (diff) | |
| parent | d9982f1f817e67149316b60fbacb0425e7179365 (diff) | |
Auto merge of #69094 - Dylan-DPC:rollup-4qe7uv1, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #67585 (Improve `char::is_ascii_*` codegen) - #68914 (Speed up `SipHasher128`.) - #68994 (rustbuild: include channel in sanitizers installed name) - #69032 (ICE in nightly-2020-02-08: handle TerminatorKind::Yield in librustc_mir::transform::promote_consts::Validator method) - #69034 (parser: Remove `Parser::prev_token_kind`) - #69042 (Remove backtrace header text) - #69059 (Remove a few unused objects) - #69089 (Properly use the darwin archive format on Apple targets) Failed merges: r? @ghost
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/generator/issue-69017.rs | 18 | ||||
| -rw-r--r-- | src/test/ui/std-backtrace.rs | 4 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/test/ui/generator/issue-69017.rs b/src/test/ui/generator/issue-69017.rs new file mode 100644 index 00000000000..511deb60e45 --- /dev/null +++ b/src/test/ui/generator/issue-69017.rs @@ -0,0 +1,18 @@ +// 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); + } +} + +fn main() {} 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"); |
