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 3 pull requests #114465

Closed
wants to merge 7 commits into from
Closed

Rollup of 3 pull requests #114465

wants to merge 7 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ttsugriy and others added 7 commits August 1, 2023 16:57
@ttsugriy
[rustc_span][perf] Remove unnecessary string joins and allocs.
f74eee2 
Comparing vectors of string parts yields the same result but avoids
unnecessary `join` and potential allocation for resulting `String`.
This code is cold so it's unlikely to have any measurable impact, but
considering but since it's also simpler, why not? :)
@chenyukang
Fix wrong span for trait selection failure error reporting
3635b48
@chenyukang
enable suggest convert to slice for binary operation
cde8f06
@sebastiantoh
Fix unwrap on None
97aa4ba
@matthiaskrgr
Rollup merge of rust-lang#113945 - chenyukang:yukang-fix-113447-slice…
a1b22a7 
…-2, r=cjgillot

Fix wrong span for trait selection failure error reporting

Fixes rust-lang#113447
@matthiaskrgr
Rollup merge of rust-lang#114351 - ttsugriy:sort-by-words, r=fee1-dead
073e4af 
[rustc_span][perf] Remove unnecessary string joins and allocs.

Comparing vectors of string parts yields the same result but avoids unnecessary `join` and potential allocation for resulting `String`. This code is cold so it's unlikely to have any measurable impact, but considering but since it's also simpler, why not? :)
@matthiaskrgr
Rollup merge of rust-lang#114461 - sebastiantoh:issue-114423, r=estebank
65fc356 
Fix unwrap on None

Fixes rust-lang#114423

r? `@estebank`
@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. rollup A PR which is a rollup labels Aug 4, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Aug 4, 2023

📌 Commit 65fc356 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 Aug 4, 2023
@bors
Copy link
Contributor

bors commented Aug 4, 2023

⌛ Testing commit 65fc356 with merge 9d5576ba46eb2ab333963f584ae4675cb6a13217...

@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) 
$DIR\default-backtrace-ice.rs
\rustc_errors\src\lib.rs
diff of stderr:

8 aborting due to `-Z treat-err-as-bug=1`
10 (end_short_backtrace)
- (begin_short_backtrace)
- (end_short_backtrace)
- (begin_short_backtrace)
---
To only update this specific test, also pass `--test-args panics\default-backtrace-ice.rs`

error: 1 errors occurred comparing output.
status: exit code: 101
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\bin;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:\Program Files\MongoDB\Server\5.0\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.6\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 (x86)\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\\stage2\\bin\\rustc.exe" "C:\\a\\rust\\rust\\tests\\ui\\panics\\default-backtrace-ice.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2" "--target=i686-pc-windows-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\ui\\panics\\default-backtrace-ice" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\native\\rust-test-helpers" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\ui\\panics\\default-backtrace-ice\\auxiliary" "-Z" "treat-err-as-bug=1"
--- stderr -------------------------------
error[E0425]: cannot find value `missing_ident` in this scope
##[error]  --> C:\a\rust\rust\tests\ui\panics\default-backtrace-ice.rs:21:13
   |
   |
LL | fn main() { missing_ident; }

thread 'rustc' panicked at compiler\rustc_errors\src\lib.rs:1719:30:
thread 'rustc' panicked at compiler\rustc_errors\src\lib.rs:1719:30:
aborting due to `-Z treat-err-as-bug=1`
   0: 0x66df2ee2 - core::fmt::write::hf5972aac32e71f35
   1: 0x66d864d4 - std::io::Write::write_fmt::h4b8cd416ea7c4aea
   2: 0x66d903c0 - std::sys_common::backtrace::print::hd5252c77ab4846fd
   2: 0x66d903c0 - std::sys_common::backtrace::print::hd5252c77ab4846fd
   3: 0x66d937cd - std::panicking::panic_hook_with_disk_dump::{{closure}}::h855608fe9199a440
   4: 0x66d935b3 - std::panicking::panic_hook_with_disk_dump::h4b3b865987cea971
   5: 0x6784ef27 - rustc_driver_impl[1447813699316639]::install_ice_hook::{closure#0}
   6: 0x66d94019 - std::panicking::rust_panic_with_hook::hdaf3afc27adf7cd8
   7: 0x66d93dc8 - std::panicking::begin_panic_handler::{{closure}}::hb238f0c07e4b1b09
   8: 0x66d91258 - std::sys_common::backtrace::__rust_end_short_backtrace::ha803bac2af67897b
   9: 0x66d93b55 - _rust_begin_unwind
  10: 0x66deec0d - core::panicking::panic_fmt::ha185faa8193fab93
  11: 0x6a8468c7 - <rustc_errors[3595e591ec95665f]::HandlerInner>::panic_if_treat_err_as_bug
  12: 0x6a8459f6 - <rustc_errors[3595e591ec95665f]::HandlerInner>::emit_diagnostic::{closure#2}
  13: 0x67a49b99 - rustc_interface[49d73fb867ed99ce]::callbacks::track_diagnostic
  14: 0x6a844d66 - <rustc_errors[3595e591ec95665f]::HandlerInner>::emit_diagnostic
  15: 0x6a8740e8 - <rustc_span[43b228cc6b235cf8]::ErrorGuaranteed as rustc_errors[3595e591ec95665f]::diagnostic_builder::EmissionGuarantee>::diagnostic_builder_emit_producing_guarantee
  16: 0x68a0d59a - <rustc_resolve[724d74e5be910032]::Resolver>::report_errors
  17: 0x68af038a - <rustc_session[d8140b72ca3318b5]::session::Session>::time::<(), <rustc_resolve[724d74e5be910032]::Resolver>::resolve_crate::{closure#0}>
  18: 0x69ff6610 - rustc_trait_selection[963fb243aaa39235]::traits::object_safety::astconv_object_safety_violations
  19: 0x69ff6aa0 - rustc_trait_selection[963fb243aaa39235]::traits::object_safety::object_safety_violations
error: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md


note: rustc 1.73.0-nightly (9d5576ba4 2023-08-04) running on i686-pc-windows-gnu

note: compiler flags: -Z threads=1 -Z simulate-remapped-rust-src-base=/rustc/FAKE_PREFIX -Z translate-remapped-path-to-local-path=no -C codegen-units=1 -Z ui-testing -Z deduplicate-diagnostics=no -Z write-long-types-to-disk=no -C strip=debuginfo -C prefer-dynamic -C rpath -C debuginfo=0 -Z treat-err-as-bug=1
query stack during panic:
#0 [resolver_for_lowering] getting the resolver for lowering
end of query stack
------------------------------------------

@bors
Copy link
Contributor

bors commented Aug 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 Aug 4, 2023
@matthiaskrgr
Copy link
Member Author

what the actual?

@Noratrieb Noratrieb mentioned this pull request Oct 15, 2023
Open
@matthiaskrgr matthiaskrgr deleted the rollup-swig5i8 branch March 16, 2024 18:19
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
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@matthiaskrgr @bors @rust-log-analyzer @rustbot @ttsugriy @chenyukang @sebastiantoh