Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 8 pull requests #123856

Merged
merged 18 commits into from
Apr 12, 2024
Merged

Rollup of 8 pull requests #123856

merged 18 commits into from
Apr 12, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

notriddle and others added 18 commits March 29, 2024 13:31
@notriddle
rustdoc: point at span in include_str!-ed md file
98642da
@notriddle
clippy: fix up include_str! spans in diagnostics
1b73c7d
@notriddle
diagnostics: fix crash on completely empty included file
1c41dd6
@estebank
Fix invalid silencing of parsing error
e572a19 
Given

```rust
macro_rules! a {
    ( ) => {
        impl<'b> c for d {
            e::<f'g>
        }
    };
}
```

ensure an error is emitted.

Fix rust-lang#123079.
@saethlin
Call the panic hook for non-unwind panics in proc-macros
d8dc28b
@dpaoliello
Update stdarch submodule
8a6ec2e
@Kohei316
Improve diagnostic by suggesting to remove visibility qualifier
ac1bee6
@goolmoos
do not add prolog for variadic naked functions
9139d72 
fixes rust-lang#99858
@kamaboko123
fix typo in library/std/src/lib.rs
47c3ffa
@JimmyOhn
Update compiler/rustc_error_codes/src/error_codes/E0384.md
0b5653f 
Add an example for the shadowing usage.
@matthiaskrgr
Rollup merge of rust-lang#123204 - notriddle:notriddle/include-str-sp…
ffea7e2 
…an, r=pnkfelix

rustdoc: point at span in `include_str!`-ed md file

Fixes rust-lang#118549
@matthiaskrgr
Rollup merge of rust-lang#123223 - estebank:issue-123079, r=pnkfelix
68359e2 
Fix invalid silencing of parsing error

Given

```rust
macro_rules! a {
    ( ) => {
        impl<'b> c for d {
            e::<f'g>
        }
    };
}
```

ensure an error is emitted.

Fix rust-lang#123079.
@matthiaskrgr
Rollup merge of rust-lang#123249 - goolmoos:naked_variadics, r=pnkfelix
4a0e9e0 
do not add prolog for variadic naked functions

fixes rust-lang#99858
@matthiaskrgr
Rollup merge of rust-lang#123825 - saethlin:report-nounwind-panics, r…
8c86920 
…=petrochenkov

Call the panic hook for non-unwind panics in proc-macros

As I suggested in rust-lang#123286 (comment).

If a proc macro causes a non-unwinding panic, `proc_macro` isn't able to catch the unwind and report the panic as a compile error by passing control back to the compiler. Our only chance to produce any diagnostic is the panic hook, so we should call it.

This scenario has already existed, but has become a lot more interesting now that we're adding more UB-detecting panics to the standard library, and such panics do not unwind.
@matthiaskrgr
Rollup merge of rust-lang#123833 - dpaoliello:stdarch, r=Amanieu
be3ea1d 
Update stdarch submodule

`asm_experimental_arch` is required in `core` as we're now using unstable inline assembly when building Arm64EC.

Brings in the fix for <rust-lang/stdarch#1555> (cc `@tslnc04).`

r? `@Amanieu`
@matthiaskrgr
Rollup merge of rust-lang#123841 - Kohei316:remove_qualifier_sugg, r=…
15a8b49 
…wesleywiser

Improve diagnostic by suggesting to remove visibility qualifier

Resolves rust-lang#123529
This PR improve diagnostic by suggesting to remove visibility qualifier.
@matthiaskrgr
Rollup merge of rust-lang#123849 - JimmyOhn:first_contribution, r=pnk…
38283bc 
…felix

Update E0384.md

Add an example for the shadowing usage.
@matthiaskrgr
Rollup merge of rust-lang#123852 - kamaboko123:fix_typo_in_std_lib_rs…
4393eab 
…, r=lqd

fix typo in library/std/src/lib.rs

I found typo in literal.
I got an error by this typo when build std.

```
salacia@Vega:~/fat12rs$ cargo build -Zbuild-std
   Compiling compiler_builtins v0.1.108
   Compiling core v0.0.0 (/home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core)
   Compiling libc v0.2.153
   Compiling memchr v2.5.0
   Compiling std v0.0.0 (/home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std)
   Compiling rustc-std-workspace-core v1.99.0 (/home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/rustc-std-workspace-core)
   Compiling alloc v0.0.0 (/home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/alloc)
   Compiling cfg-if v1.0.0
   Compiling unwind v0.0.0 (/home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/unwind)
   Compiling adler v1.0.2
   Compiling rustc-demangle v0.1.23
   Compiling rustc-std-workspace-alloc v1.99.0 (/home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/rustc-std-workspace-alloc)
   Compiling gimli v0.28.1
   Compiling object v0.32.2
   Compiling addr2line v0.21.0
   Compiling miniz_oxide v0.7.2
   Compiling std_detect v0.1.5 (/home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/stdarch/crates/std_detect)
   Compiling hashbrown v0.14.3
   Compiling panic_abort v0.0.0 (/home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/panic_abort)
   Compiling panic_unwind v0.0.0 (/home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/panic_unwind)
error: expected `,`, found `.`
   --> /home/salacia/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/lib.rs:224:78
    |
224 |             `#![no_std]` or overriding this warning by enabling this feature".
    |                                                                              ^ expected `,`

error: could not compile `std` (lib) due to 1 previous error
:224:78
    |
224 |             `#![no_std]` or overriding this warning by enabling this feature".
    |                                                                              ^ expected `,`

error: could not compile `std` (lib) due to 1 previous error
```
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 12, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Apr 12, 2024

📌 Commit 4393eab has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2024
@bors
Copy link
Contributor

bors commented Apr 12, 2024

⌛ Testing commit 4393eab with merge 322e92b...

@bors
Copy link
Contributor

bors commented Apr 12, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 322e92b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 12, 2024
@bors bors merged commit 322e92b into rust-lang:master Apr 12, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 12, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#123204 rustdoc: point at span in include_str!-ed md file 1cd9a674d7a72659b52c167f025ad0799c950359 (link)
#123223 Fix invalid silencing of parsing error e2fb846a057e922c51755ccbae6e00d1321cb710 (link)
#123249 do not add prolog for variadic naked functions affb9a805d91b08a7054001d3d4fed2b9ae043b9 (link)
#123825 Call the panic hook for non-unwind panics in proc-macros 10b568e21db6aa0e38cf070f99b39a110c363952 (link)
#123833 Update stdarch submodule 66957d00d9b136925a9d0c0fe65c028111e019e9 (link)
#123841 Improve diagnostic by suggesting to remove visibility quali… 5fe51ac617cdd732c71565601d139669f6db98d8 (link)
#123849 Update E0384.md dc1b23f3915ef3ad28847d02b0c3d09f5330b0a0 (link)
#123852 fix typo in library/std/src/lib.rs 84b2e434cbcf1c7c496b9a3b581b13603e534b75 (link)

previous master: bd71213cf0

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@bors bors mentioned this pull request Apr 12, 2024
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (322e92b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 2.8% [2.0%, 3.6%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.8% [2.0%, 3.6%] 2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 2.2% [2.2%, 2.3%] 2
Regressions ❌
(secondary)		 3.0% [2.4%, 3.9%] 14
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.2% [2.2%, 2.3%] 2

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 675.519s -> 677.195s (0.25%)
Artifact size: 315.97 MiB -> 316.01 MiB (0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-4v8rkfj branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.