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

cargo update #113046

Merged
merged 4 commits into from
Jul 2, 2023
Merged

cargo update #113046

merged 4 commits into from
Jul 2, 2023

Conversation

Nilstrieb
Copy link
Member

@Nilstrieb Nilstrieb commented Jun 26, 2023

#112865 with the tidy exemptions and tracing and syn 2 not upgraded

Additional deps:
equivalent: indexmap
errno: through rustix
errno-dragonfly: errno
nu-ansi-term: tracing
overload: nu-ansi-term

r? Mark-Simulacrum

@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) labels Jun 26, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jun 26, 2023

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.

@Nilstrieb Nilstrieb mentioned this pull request Jun 26, 2023
@Nilstrieb
Copy link
Member Author

Nilstrieb commented Jun 26, 2023

test [ui] tests/ui/rustc-rust-log.rs has been running for a long time

uh, maybe that's just from github actions being weird, let's try again. could also be a result of the update.

@Nilstrieb
Copy link
Member Author

#0  syscall () at ../sysdeps/unix/sysv/linux/aarch64/syscall.S:38
#1  0x0000ffffee86a2a4 in std::sys::unix::futex::futex_wait () at library/std/src/sys/unix/futex.rs:62
warning: Could not find DWO CU /home/gh-Nilstrieb/rust/build/aarch64-unknown-linux-gnu/stage0-rustc/aarch64-unknown-linux-gnu/release/deps/rustc_log-6500631811ec3d52.8vvf8lge0lnph3o.rcgu.dwo(0x5c39643e5d93eb9c) referenced by CU at offset 0x266c [in module /home/gh-Nilstrieb/.rustup/toolchains/dev/lib/librustc_driver-6cbde7d319146064.so]
#2  0x0000ffffee879730 in std::sys::unix::locks::futex_mutex::Mutex::lock_contended () at library/std/src/sys/unix/locks/futex_mutex.rs:56
warning: Could not find DWO CU /home/gh-Nilstrieb/rust/build/aarch64-unknown-linux-gnu/stage0-rustc/aarch64-unknown-linux-gnu/release/deps/tracing_core-5c5dfc13d1ebc492.tracing_core.f3f963a3ad907cfb-cgu.13.rcgu.dwo(0x9dcd3b965a21f5cd) referenced by CU at offset 0x6b8fb [in module /home/gh-Nilstrieb/.rustup/toolchains/dev/lib/librustc_driver-6cbde7d319146064.so]
#3  0x0000fffff2229c4c in <tracing_tree::HierarchicalLayer<std::io::stdio::stderr> as tracing_subscriber::layer::Layer<tracing_subscriber::layer::layered::Layered<tracing_subscriber::filter::env::EnvFilter, tracing_subscriber::registry::sharded::Registry>>>::on_event () at library/std/src/sys/unix/locks/futex_mutex.rs:28
warning: Could not find DWO CU /home/gh-Nilstrieb/rust/build/aarch64-unknown-linux-gnu/stage0-rustc/aarch64-unknown-linux-gnu/release/deps/rustc_hir-009cbe7ef1e89bf5.5e4z4f44z43mtelo.rcgu.dwo(0x158fc8ddd7884213) referenced by CU at offset 0x5b420 [in module /home/gh-Nilstrieb/.rustup/toolchains/dev/lib/librustc_driver-6cbde7d319146064.so]
#4  0x0000fffff7641e50 in <tracing_core::event::Event>::dispatch () at src/event.rs:34
warning: Could not find DWO CU /home/gh-Nilstrieb/rust/build/aarch64-unknown-linux-gnu/stage0-rustc/aarch64-unknown-linux-gnu/release/deps/rustc_middle-3cef6bae7012dac6.2ctqq4ha7ai9y4z5.rcgu.dwo(0xa55885daeee72a5a) referenced by CU at offset 0x50cf8 [in module /home/gh-Nilstrieb/.rustup/toolchains/dev/lib/librustc_driver-6

tracing is stuck locking a mutex :(

@Nilstrieb
Copy link
Member Author

I downgraded tracing, the cause of the deadlock. I'll take a look at that issue later, but this is unblocked now.

@rust-log-analyzer

This comment has been minimized.

@Nilstrieb
Copy link
Member Author

I've opened tokio-rs/tracing#2635 for the tracing issue.

@Nilstrieb
Copy link
Member Author

The diagnostics derive proc macro output changes are probably from the syn update. I'm gonna keep syn on the older version for now, we can update that in a separate PR since it isn't entirely trivial to bless.

@bors
Copy link
Contributor

bors commented Jun 28, 2023

☔ The latest upstream changes (presumably #113120) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member

r=me with a rebase

@rustbot
Copy link
Collaborator

rustbot commented Jul 1, 2023

Some changes occurred in src/tools/cargo

cc @ehuss

@Nilstrieb
Copy link
Member Author

accidentally rebased too much

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jul 1, 2023

📌 Commit ddf613a585aaf229c59a5e783840e7c6b174575c has been approved by Mark-Simulacrum

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 Jul 1, 2023
@bors
Copy link
Contributor

bors commented Jul 1, 2023

⌛ Testing commit ddf613a585aaf229c59a5e783840e7c6b174575c with merge 7ad85838a63f96ee28741a1589a700413073dbbb...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jul 1, 2023

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 1, 2023
@bors
Copy link
Contributor

bors commented Jul 2, 2023

☔ The latest upstream changes (presumably #113260) made this pull request unmergeable. Please resolve the merge conflicts.

There's currently a deadlock with tracing when RUSTC_LOG is enabled.
Downgrade tracing-core for now to avoid blocking the other updates.

syns upgrades cause some nontrivial changes in the diagnostics derive tests,
which are best dealt with in another PR.
The outline-atomics support in compiler_builtins messed up and wasn't limited to linux only.
https://github.com/rust-lang/compiler-builtins/pull/532/files#r1249354225
@Nilstrieb
Copy link
Member Author

@bors r=Mark-Simulacrum p=15 this is really bitrotty

@bors
Copy link
Contributor

bors commented Jul 2, 2023

📌 Commit 1e5d8fb has been approved by Mark-Simulacrum

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 Jul 2, 2023
@bors
Copy link
Contributor

bors commented Jul 2, 2023

⌛ Testing commit 1e5d8fb with merge 839e9a6...

@bors
Copy link
Contributor

bors commented Jul 2, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 839e9a6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 2, 2023
@bors bors merged commit 839e9a6 into rust-lang:master Jul 2, 2023
12 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jul 2, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (839e9a6): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -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
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.1% [-2.0%, -0.4%] 119
Improvements ✅
(secondary)
-0.9% [-1.6%, -0.2%] 48
All ❌✅ (primary) -1.1% [-2.0%, -0.4%] 119

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.4% [0.4%, 2.4%] 9
Regressions ❌
(secondary)
2.9% [1.9%, 5.4%] 6
Improvements ✅
(primary)
-3.2% [-3.2%, -3.2%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.9% [-3.2%, 2.4%] 10

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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.4% [-4.8%, -0.6%] 15
Improvements ✅
(secondary)
-2.4% [-2.4%, -2.4%] 1
All ❌✅ (primary) -2.4% [-4.8%, -0.6%] 15

Binary size

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

Bootstrap: 660.214s -> 668.087s (1.19%)

@Nilstrieb Nilstrieb deleted the update branch July 3, 2023 03:56
@Nilstrieb
Copy link
Member Author

-12,312,296  ???:<rustc_query_system::dep_graph::graph::DepGraphData<rustc_middle::dep_graph::dep_node::DepKind>>::try_mark_previous_green::<rustc_query_impl::plumbing::QueryCtxt>
  9,138,169  ???:<rustc_query_system::dep_graph::graph::DepGraph<rustc_middle::dep_graph::dep_node::DepKind>>::exec_cache_promotions::<rustc_middle::ty::context::TyCtxt>
 -8,905,715  ???:<rustc_middle::query::on_disk_cache::OnDiskCache>::drop_serialized_data
 -4,094,167  ???:<rustc_span::span_encoding::Span as rustc_data_structures::stable_hasher::HashStable<rustc_query_system::ich::hcx::StableHashingContext>>::hash_stable
 -3,064,841  ???:<rustc_query_system::dep_graph::graph::CurrentDepGraph<rustc_middle::dep_graph::dep_node::DepKind>>::intern_node
  2,912,883  ???:<rustc_middle::metadata::ModChild as rustc_serialize::serialize::Encodable<rustc_metadata::rmeta::encoder::EncodeContext>>::encode
  2,693,565  ???:<rustc_middle::metadata::ModChild as rustc_serialize::serialize::Decodable<rustc_metadata::rmeta::decoder::DecodeContext>>::decode
  2,543,132  ???:<&rustc_middle::ty::typeck_results::TypeckResults as rustc_serialize::serialize::Decodable<rustc_middle::query::on_disk_cache::CacheDecoder>>::decode
 -2,212,033  ???:<rustc_middle::ty::Ty as rustc_serialize::serialize::Decodable<rustc_metadata::rmeta::decoder::DecodeContext>>::decode
  2,191,548  ???:<&rustc_middle::ty::typeck_results::TypeckResults as rustc_serialize::serialize::Encodable<rustc_middle::query::on_disk_cache::CacheEncoder>>::encode
  2,135,561  ???:<alloc::vec::Vec<rustc_middle::ty::VariantDef> as rustc_serialize::serialize::Decodable<rustc_metadata::rmeta::decoder::DecodeContext>>::decode
 -2,064,850  ???:<core::iter::sources::from_generator::FromGenerator<<rustc_metadata::creader::CrateMetadataRef>::get_module_children::{closure#0}> as core::iter::traits::iterator::Iterator>::next

bitmaps IncrUnchanged
looks like metadata decoding got faster

cuviper added a commit to cuviper/rust that referenced this pull request Jul 3, 2023
The new version was already added to the tree as an indirect dependency
in rust-lang#113046, but now our direct dependents are using it too.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 4, 2023
Upgrade to indexmap 2.0.0

The new version was already added to the tree as an indirect dependency
in rust-lang#113046, but now our direct dependents are using it too.
@Nilstrieb
Copy link
Member Author

Nilstrieb commented Aug 3, 2023

1.72.0 will be a release that won't be too interesting, so I think it's a great opportunity to mention this PR in the blog post (or even release notes). Saying that the compiler updated dependencies and got a free 1% speedup for incremental compilations, reminding people to update their own deps :)

@Nilstrieb Nilstrieb added the relnotes-perf Performance improvements that should be mentioned in the release notes label Aug 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. relnotes-perf Performance improvements that should be mentioned in the release notes 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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants