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.

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

Rollup of 7 pull requests #115537

Closed
wants to merge 17 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Enselic and others added 17 commits August 30, 2023 20:43
Does the `stop linting in box/arc initialization` task of 83518.
…rochenkov

Add an allow attribute suggestion along with the implied by suggestion

This PR adds an `#[allow(...)]` attribute hep suggestion along with the implied by suggestion:
```diff
  note: `-W dead-code` implied by `-W unused`
+ help: to override `-W unused` add `#[allow(dead_code)]`
```

This PR also adds the `OnceHelp` lint level (similar to `OnceNote`) to only put the help message one time, like the implied note.

Related to rust-lang#114030
Emit error instead of ICE when optimized MIR is missing

Closes rust-lang#51388
…fety, r=oli-obk

Do not require associated types with Self: Sized to uphold bounds when confirming object candidate

RPITITs and associated types that have `Self: Sized` bounds are opted out of the `dyn Trait` well-formedness check that happens during confirmation. This ensures that we can actually *use* `dyn Trait`s that have associated types that, e.g., have GATs and RPITITs and other naughty things as long as those are opted-out of object safety via a `Self: Sized` bound.

Fixes rust-lang#115464

This seems like a natural part of rust-lang#112319 (comment), and I don't think needs re-litigation.

r? `@oli-obk`
Take `&mut Results` in `ResultsVisitor`

This fixes a small oversight from rust-lang#108293.
Allow `large_assignments` for Box/Arc/Rc initialization

Does the `stop linting in box/arc initialization` task of rust-lang#83518.

r? `@oli-obk` who is E-mentor.
…ice, r=lcnr

Don't ICE on associated type projection without feature gate in new solver

Self-explanatory, we should avoid ICEs when the feature gate is not enabled. Continue to ICE when the feature gate *is* enabled, though.

Fixes rust-lang#115500
Expose more information with DefId in smir

Currently `Debug` for `DefId` doesn't provide enough information, this changes so that we get `usize` of the `DefId` and the name of it.

r? `@oli-obk`
@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative rollup A PR which is a rollup labels Sep 4, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Sep 4, 2023

📌 Commit 9e26c90 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Sep 4, 2023

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Sep 4, 2023
@bors
Copy link
Contributor

bors commented Sep 4, 2023

⌛ Testing commit 9e26c90 with merge 053692aa411d8ffcaed73e63bdfc88f0823553e4...

@rust-log-analyzer
Copy link
Collaborator

The job i686-mingw failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] tests\ui\runtime\backtrace-debuginfo.rs stdout ----

error: test run failed!
status: exit code: 101
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\lib\rustlib\i686-pc-windows-gnu\lib;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0-bootstrap-tools\i686-pc-windows-gnu\release\deps;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw32\bin;C:\hostedtoolcache\windows\Python\3.11.4\x64\Scripts;C:\hostedtoolcache\windows\Python\3.11.4\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\PROGRA~1\MongoDB\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.11.1\x64;C:\cabal\bin;C:\ghcup\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.3.1\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\npm\prefix;C:\hostedtoolcache\windows\go\1.20.7\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.382-5\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\160\DTS\Binn;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.8.7\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\ui\\runtime\\backtrace-debuginfo\\a.exe"
---------------------------------------
trace does not match position list
trace does not match position list
still need to find ["backtrace-debuginfo.rs:184"]
--- stdout
backtrace-debuginfo-aux.rs:6
backtrace-debuginfo.rs:106
backtrace-debuginfo.rs:121
backtrace-debuginfo.rs:121
backtrace-debuginfo.rs:184

--- stderr
test case 7
thread 'main' panicked at C:\a\rust\rust\tests\ui\runtime\backtrace-debuginfo.rs:107:9:
explicit panic
stack backtrace:
   0: 0x65b427c5 - core::fmt::write::h20980d921231199e
   1: 0x65ad5e94 - std::io::Write::write_fmt::h0bd50d9eba38f555
   2: 0x65adfa70 - std::sys_common::backtrace::print::hd538b445f7e3bdaf
   3: 0x65ae2ead - std::panicking::panic_hook_with_disk_dump::{{closure}}::h6b183c42bcde6b11
   4: 0x65ae2c72 - std::panicking::panic_hook_with_disk_dump::h15ffa4da5061436e
   6:   0x8f3484 - std::panicking::begin_panic::{{closure}}::ha7bc38ad5f64b8e4
                       at /rustc/FAKE_PREFIX\library\std\src/panicking.rs:661:9
   7:   0x8f3072 - std::sys_common::backtrace::__rust_end_short_backtrace::h8c46167653700b54
                       at /rustc/FAKE_PREFIX\library\std\src\sys_common/backtrace.rs:170:18
                       at /rustc/FAKE_PREFIX\library\std\src\sys_common/backtrace.rs:170:18
   8:   0x8f3400 - std::panicking::begin_panic::h794e99d3a106dee2
                       at /rustc/FAKE_PREFIX\library\std\src/panicking.rs:660:12
   9:   0x905c6e - backtrace_debuginfo::inner_inlined::{{closure}}::hf503b1c4bc467e92
                       at C:\a\rust\rust\tests\ui\runtime\backtrace-debuginfo.rs:107:9
  10:   0x905461 - backtrace_debuginfo::aux::callback::hd2037a42c4ee04c3
  11:   0x90620f - backtrace_debuginfo::inner_inlined::h1186d3be7b2820e4
                       at C:\a\rust\rust\tests\ui\runtime\backtrace-debuginfo.rs:106:29
  12:   0x90620f - backtrace_debuginfo::outer::h21d58bbf1167d7dc
                       at C:\a\rust\rust\tests\ui\runtime\backtrace-debuginfo.rs:121:5
                       at C:\a\rust\rust\tests\ui\runtime\backtrace-debuginfo.rs:121:5
  13:  0x11298a8 - <unknown>
  14:   0x8f4179 - core::ops::function::FnOnce::call_once::h82d3c39ff90a481c
                       at /rustc/FAKE_PREFIX\library\core\src\ops/function.rs:250:5
  15:   0x8f3091 - std::sys_common::backtrace::__rust_begin_short_backtrace::h8ba22f37bc2e4f62
                       at /rustc/FAKE_PREFIX\library\std\src\sys_common/backtrace.rs:154:18
  16:   0x8f3103 - std::rt::lang_start::{{closure}}::hdfc8536070935f04
                       at /rustc/FAKE_PREFIX\library\std\src/rt.rs:166:18
  17: 0x65ac8efa - std::rt::lang_start_internal::h7b152e7291e37b4d
  18:   0x8f30db - std::rt::lang_start::hd4b8af2792a1ce46
                       at /rustc/FAKE_PREFIX\library\std\src/rt.rs:165:17
  19:   0x9072be - _main
  20:   0x8f1386 - ___tmainCRTStartup
  21: 0x758e05c9 - <unknown>
  22: 0x771977ad - <unknown>
  23: 0x7719777d - <unknown>
--- stderr -------------------------------
thread 'main' panicked at C:\a\rust\rust\tests\ui\runtime\backtrace-debuginfo.rs:174:9:
found some errors
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

@bors
Copy link
Contributor

bors commented Sep 4, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 4, 2023
@matthiaskrgr matthiaskrgr deleted the rollup-4cxh2en branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants