-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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 #117843 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
[stable] Prepare 1.74.0 release https://forge.rust-lang.org/release/process.html#promote-branches-t-3-days-monday Also backports: * Disabling specialization as an alternative backport of "Fix excessive initialization and reads beyond EOF in io::copy(_, Vec<u8>) specialization #117576" * coverage: Avoid creating malformed macro name spans #117827 r? `@Mark-Simulacrum`
- Loading branch information
Showing
8 changed files
with
314 additions
and
55 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| beta | ||
| stable |
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,10 @@ | ||
| // edition: 2021 | ||
|
|
||
| #[macro_export] | ||
| macro_rules! macro_that_defines_a_function { | ||
| (fn $name:ident () $body:tt) => { | ||
| fn $name () -> () $body | ||
| } | ||
| } | ||
|
|
||
| // Non-executable comment. |
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,39 @@ | ||
| $DIR/auxiliary/macro_name_span_helper.rs: | ||
| LL| |// edition: 2021 | ||
| LL| | | ||
| LL| |#[macro_export] | ||
| LL| |macro_rules! macro_that_defines_a_function { | ||
| LL| | (fn $name:ident () $body:tt) => { | ||
| LL| 1| fn $name () -> () $body | ||
| LL| | } | ||
| LL| |} | ||
| LL| | | ||
| LL| |// Non-executable comment. | ||
|
|
||
| $DIR/macro_name_span.rs: | ||
| LL| |// edition: 2021 | ||
| LL| | | ||
| LL| |// Regression test for <https://github.com/rust-lang/rust/issues/117788>. | ||
| LL| |// Under some circumstances, the heuristics that detect macro name spans can | ||
| LL| |// get confused and produce incorrect spans beyond the bounds of the span | ||
| LL| |// being processed. | ||
| LL| | | ||
| LL| |// aux-build: macro_name_span_helper.rs | ||
| LL| |extern crate macro_name_span_helper; | ||
| LL| | | ||
| LL| 1|fn main() { | ||
| LL| 1| affected_function(); | ||
| LL| 1|} | ||
| LL| | | ||
| LL| |macro_rules! macro_with_an_unreasonably_and_egregiously_long_name { | ||
| LL| | () => { | ||
| LL| | println!("hello"); | ||
| LL| | }; | ||
| LL| |} | ||
| LL| | | ||
| LL| |macro_name_span_helper::macro_that_defines_a_function! { | ||
| LL| | fn affected_function() { | ||
| LL| | macro_with_an_unreasonably_and_egregiously_long_name!(); | ||
| LL| | } | ||
| LL| |} | ||
|
|
Oops, something went wrong.