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

cargo update #120454

Merged
merged 6 commits into from Feb 14, 2024
Merged

cargo update #120454

merged 6 commits into from Feb 14, 2024

Conversation

clubby789
Copy link
Contributor

Run cargo update, with some pinning and fixes necessitated by that. This should unblock #112865

There's a couple of places where I only pinned a dependency in one location - this seems like a bit of a hack, but better than duplicating the FIXME across all Cargo.toml where a dependency is introduced.

cc @Nilstrieb

@rustbot
Copy link
Collaborator

rustbot commented Jan 28, 2024

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 28, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jan 28, 2024

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Jan 28, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member

We should run a perf build before merging (but looks like too early for that to be possible).

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@clubby789 clubby789 mentioned this pull request Jan 28, 2024
Open
@clubby789
Copy link
Contributor Author

@dtolnay

Investigating the above issue, it looks like proc-macro@1.0.71 works whereas 1.0.72 has the missing spans (which lines up with the diff between versions https://github.com/dtolnay/proc-macro2/compare/1.0.71..1.0.72#diff-d0d98998092552a1d3259338c2c71e118a5b8343dd4703c0c7f552ada7f9cb42)

@dtolnay
Copy link
Member

dtolnay commented Jan 28, 2024

I think that is an intentional consequence of dtolnay/thiserror#248 (subsequently ported to proc-macro2). We don't want these crates using any unstable functionality when used as a rustc dependency, regardless of whether it might work.

@clubby789
Copy link
Contributor Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 29, 2024
@bors
Copy link
Contributor

bors commented Jan 29, 2024

⌛ Trying commit 2d164da with merge af2531d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 29, 2024
@bors
Auto merge of rust-lang#120454 - clubby789:cargo-update, r=<try>
af2531d 
`cargo update`

Run `cargo update`, with some pinning and fixes necessitated by that. This *should* unblock rust-lang#112865

There's a couple of places where I only pinned a dependency in one location - this seems like a bit of a hack, but better than duplicating the FIXME across all `Cargo.toml` where a dependency is introduced.

cc `@Nilstrieb`
@bors
Copy link
Contributor

bors commented Jan 29, 2024

☀️ Try build successful - checks-actions
Build commit: af2531d (af2531dffa23d43725d68081803b0da65322b6ca)

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (af2531d): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.5% [0.2%, 1.2%] 29
Regressions ❌
(secondary)		 0.9% [0.2%, 4.0%] 26
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -1.0% [-1.6%, -0.2%] 9
All ❌✅ (primary) 0.5% [0.2%, 1.2%] 29

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)		 1.9% [0.2%, 4.8%] 3
Regressions ❌
(secondary)		 3.1% [1.7%, 5.5%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -4.9% [-5.5%, -4.2%] 3
All ❌✅ (primary) 1.9% [0.2%, 4.8%] 3

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)		 1.4% [1.4%, 1.4%] 1
Regressions ❌
(secondary)		 1.7% [0.9%, 2.8%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.8% [-3.5%, -2.1%] 6
All ❌✅ (primary) 1.4% [1.4%, 1.4%] 1

Binary size

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)		 0.6% [0.1%, 1.1%] 19
Regressions ❌
(secondary)		 1.0% [0.2%, 1.2%] 75
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.6% [0.1%, 1.1%] 19

Bootstrap: 662.476s -> 667.297s (0.73%)
Artifact size: 308.14 MiB -> 309.25 MiB (0.36%)

@rustbot rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jan 29, 2024
@klensy
Copy link
Contributor

klensy commented Jan 29, 2024

https://github.com/indexmap-rs/indexmap/blob/2.2.1/RELEASES.md

2.2.1

Corrected the signature of RawOccupiedEntryMut::into_key(self) -> &'a mut K, This a breaking change from 2.2.0, but that version was published for less than a day and has now been yanked.

@clubby789
Copy link
Contributor Author

cc fix was released, then yanked again 😔 Hopefully the rest of this goes through for now

@bors r=Nilstrieb

@bors
Copy link
Contributor

bors commented Feb 13, 2024

📌 Commit 9b73db3 has been approved by Nilstrieb

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 13, 2024
@bors
Copy link
Contributor

bors commented Feb 14, 2024

⌛ Testing commit 9b73db3 with merge a2b0c4b...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2024
@bors
Auto merge of rust-lang#120454 - clubby789:cargo-update, r=Nilstrieb
a2b0c4b 
`cargo update`

Run `cargo update`, with some pinning and fixes necessitated by that. This *should* unblock rust-lang#112865

There's a couple of places where I only pinned a dependency in one location - this seems like a bit of a hack, but better than duplicating the FIXME across all `Cargo.toml` where a dependency is introduced.

cc `@Nilstrieb`
@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) 
---- [rustdoc] tests\rustdoc\deprecated.rs stdout ----

error: rustdoc failed!
status: exit code: 0xc0000005
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.12.1\x64\Scripts;C:\hostedtoolcache\windows\Python\3.12.1\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.13.1\x64;C:\cabal\bin;C:\ghcup\bin;C:\mingw64\bin;C:\Program Files\dotnet;C:\Program Files\MySQL\MySQL Server 5.7\bin;C:\Program Files\R\R-4.3.2\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\SeleniumWebDrivers\ChromeDriver;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.13\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.402-6\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:\ProgramData\Chocolatey\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;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:\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\\rustdoc.exe" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2\\lib\\rustlib\\i686-pc-windows-gnu\\lib" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc\\deprecated\\auxiliary" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc\\deprecated" "--deny" "warnings" "C:\\a\\rust\\rust\\tests\\rustdoc\\deprecated.rs" "-A" "internal_features"
stderr: none

@bors
Copy link
Contributor

bors commented Feb 14, 2024

💔 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 Feb 14, 2024
@clubby789
Copy link
Contributor Author

@bors retry

@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 Feb 14, 2024
@bors
Copy link
Contributor

bors commented Feb 14, 2024

⌛ Testing commit 9b73db3 with merge cc1c099...

@bors
Copy link
Contributor

bors commented Feb 14, 2024

☀️ Test successful - checks-actions
Approved by: Nilstrieb
Pushing cc1c099 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 14, 2024
@bors bors merged commit cc1c099 into rust-lang:master Feb 14, 2024
12 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 14, 2024
This was referenced Feb 14, 2024
Open
Closed
Closed
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cc1c099): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 1.4% [0.8%, 1.9%] 10
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.9% [-3.4%, -0.2%] 15
All ❌✅ (primary) - - 0

Max RSS (memory usage)

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

Cycles

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

Binary size

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)		 0.2% [0.0%, 0.6%] 16
Regressions ❌
(secondary)		 0.3% [0.1%, 0.7%] 68
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.2% [0.0%, 0.6%] 16

Bootstrap: 630.069s -> 632.386s (0.37%)
Artifact size: 305.08 MiB -> 306.13 MiB (0.34%)

@Kobzol
Copy link
Contributor

Kobzol commented Feb 14, 2024

Improvements and regressions balances themselves out. There are some small binary size regressions though.

@clubby789
Copy link
Contributor Author

clubby789 commented Feb 14, 2024 •
edited

I did a quick analysis - some std dependencies were updated

@Kobzol
Copy link
Contributor

Kobzol commented Feb 14, 2024

Oh, sorry, I missed that. Ok, not much we can do about that.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Feb 14, 2024
@Nilstrieb
Copy link
Member

Thank you very much for getting this through!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cuviper cuviper cuviper left review comments

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

@Nilstrieb Nilstrieb Nilstrieb requested changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.

None yet