-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #64097 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports Rolled up: * [beta] Utilize released stable over dev-static #64046 Cherry picked: * Update rust-installer to limit memory use #63984 * debuginfo: give unique names to closure and generator types #63875 * ci: move libc mirrors to the rust-lang-ci-mirrors bucket #63772 * Fix nested eager expansions in arguments of `format_args` #63717 r? @ghost
- Loading branch information
Showing
14 changed files
with
140 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // This test makes sure that the LLDB pretty printer does not throw an exception | ||
| // for nested closures and generators. | ||
|
|
||
| // Require LLVM with DW_TAG_variant_part and a gdb that can read it. | ||
| // min-system-llvm-version: 8.0 | ||
| // min-gdb-version: 8.2 | ||
| // ignore-tidy-linelength | ||
|
|
||
| // compile-flags:-g | ||
|
|
||
| // === GDB TESTS =================================================================================== | ||
|
|
||
| // gdb-command:run | ||
|
|
||
| // gdb-command:print g | ||
| // gdb-check:$1 = issue_57822::main::closure-1 (issue_57822::main::closure-0 (1)) | ||
|
|
||
| // gdb-command:print b | ||
| // gdb-check:$2 = issue_57822::main::generator-3 {__0: issue_57822::main::generator-2 {__0: 2, <<variant>>: {[...]}}, <<variant>>: {[...]}} | ||
|
|
||
| // === LLDB TESTS ================================================================================== | ||
|
|
||
| // lldb-command:run | ||
|
|
||
| // lldb-command:print g | ||
| // lldbg-check:(issue_57822::main::closure-1) $0 = closure-1(closure-0(1)) | ||
|
|
||
| // lldb-command:print b | ||
| // lldbg-check:(issue_57822::main::generator-3) $1 = generator-3(generator-2(2)) | ||
|
|
||
| #![feature(omit_gdb_pretty_printer_section, generators, generator_trait)] | ||
| #![omit_gdb_pretty_printer_section] | ||
|
|
||
| use std::ops::Generator; | ||
| use std::pin::Pin; | ||
|
|
||
| fn main() { | ||
| let mut x = 1; | ||
| let f = move || x; | ||
| let g = move || f(); | ||
|
|
||
| let mut y = 2; | ||
| let mut a = move || { | ||
| y += 1; | ||
| yield; | ||
| }; | ||
| let mut b = move || { | ||
| Pin::new(&mut a).resume(); | ||
| yield; | ||
| }; | ||
|
|
||
| zzz(); // #break | ||
| } | ||
|
|
||
| fn zzz() { () } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // Regression test for the issue #63460. | ||
|
|
||
| // check-pass | ||
|
|
||
| #[macro_export] | ||
| macro_rules! separator { | ||
| () => { "/" }; | ||
| } | ||
|
|
||
| #[macro_export] | ||
| macro_rules! concat_separator { | ||
| ( $e:literal, $($other:literal),+ ) => { | ||
| concat!($e, $crate::separator!(), $crate::concat_separator!($($other),+)) | ||
| }; | ||
| ( $e:literal ) => { | ||
| $e | ||
| } | ||
| } | ||
|
|
||
| fn main() { | ||
| println!("{}", concat_separator!(2, 3, 4)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // Opaque macro can eagerly expand its input without breaking its resolution. | ||
| // Regression test for issue #63685. | ||
|
|
||
| // check-pass | ||
|
|
||
| macro_rules! foo { | ||
| () => { | ||
| "foo" | ||
| }; | ||
| } | ||
|
|
||
| macro_rules! bar { | ||
| () => { | ||
| foo!() | ||
| }; | ||
| } | ||
|
|
||
| fn main() { | ||
| format_args!(bar!()); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule clippy
updated
from 72da10 to 3aea86