Skip to content

Conversation

@clubby789
Copy link
Contributor

#145849 (comment)
This manually downgrades the wasip/wit-bindgen/getrandom deps to avoid pulling in a binary blob, but it would be good to pin this automatically in a way which doesn't cause these blobs to be pulled in.

@rustbot
Copy link
Collaborator

rustbot commented Nov 11, 2025

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.

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

@rustbot rustbot added A-tidy Area: The tidy tool 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 Nov 11, 2025
@rustbot
Copy link
Collaborator

rustbot commented Nov 11, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@jieyouxu
Copy link
Member

r? me

@rustbot rustbot assigned jieyouxu and unassigned Mark-Simulacrum Nov 12, 2025
@jieyouxu jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 12, 2025
@clubby789 clubby789 force-pushed the cargo-update-11-11-25 branch from ffd3051 to 0e471f5 Compare November 12, 2025 12:53
@rustbot
Copy link
Collaborator

rustbot commented Nov 12, 2025

If the Unicode version changes are intentional,
it should also be updated in the reference at
https://github.com/rust-lang/reference/blob/HEAD/src/identifiers.md.

cc @ehuss

@clubby789
Copy link
Contributor Author

I'll open a reference PR for the Unicode change if this looks good

@clubby789 clubby789 force-pushed the cargo-update-11-11-25 branch from 0e471f5 to ba8a32b Compare November 12, 2025 12:58
@rustbot

This comment has been minimized.

@clubby789
Copy link
Contributor Author

Backed out those changes in favour of #148321

@jieyouxu
Copy link
Member

jieyouxu commented Nov 13, 2025

Unsure what the status of this PR is

This manually downgrades the wasip/wit-bindgen/getrandom deps to avoid pulling in a binary blob, but it would be good to pin this automatically in a way which doesn't cause these blobs to be pulled in.

... Wait, does this only modify the lockfile? Can we explicitly pin those deps? Also, that seems a bit concerning, because if those deps release a point release for $bug, we won't be able to bump without introducing the binary blobs (if I'm understanding what you're saying) right?

@bors
Copy link
Collaborator

bors commented Nov 13, 2025

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

@clubby789
Copy link
Contributor Author

Wait, does this only modify the lockfile? Can we explicitly pin those deps?

There's some discussion here. The relevant dep is 'pinned' in the tidy license checker (though this is complicated by the blob being moved to a different crate). The motivation for doing it like this vs a direct Cargo.toml dep is:

I couldn't figure out how to do this robustly. Cargo is designed to support multiple versions of the same dependency. We can lock a direct dependency but if a dependency of a dependency bumps the major wit-bindgen-rt version then I don't think we can protect against that using Cargo.toml alone. We'll just end up with multiple versions.

@clubby789 clubby789 force-pushed the cargo-update-11-11-25 branch from dd42eac to 2311693 Compare November 16, 2025 19:57
@rustbot

This comment has been minimized.

@clubby789
Copy link
Contributor Author

Added some pinning in Cargo.toml to try and avoid these bumps in cargo update, while leaving the pin in deps.rs.

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 16, 2025
@rust-log-analyzer

This comment has been minimized.

@jieyouxu
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Nov 20, 2025

📌 Commit 4987db3 has been approved by jieyouxu

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 Nov 20, 2025
Zalathar added a commit to Zalathar/rust that referenced this pull request Nov 20, 2025
…=jieyouxu

Bump compiler dependencies

rust-lang#145849 (comment)
This manually downgrades the `wasip`/`wit-bindgen`/`getrandom` deps to avoid pulling in a binary blob, but it would be good to pin this automatically in a way which doesn't cause these blobs to be pulled in.
bors added a commit that referenced this pull request Nov 20, 2025
Rollup of 10 pull requests

Successful merges:

 - #146925 (Add doc for va_list APIs)
 - #147035 (alloc: fix `Debug` implementation of `ExtractIf`)
 - #147173 (Add support for hexagon-unknown-qurt target)
 - #148261 (rustc_public: Make Id types !Send / !Sync)
 - #148831 (Bump compiler dependencies)
 - #149041 (ignore unsized types in mips64 and sparc64 callconvs)
 - #149056 (fix the fragment_in_dst_padding_gets_overwritten test on s390x)
 - #149071 (Add test scaffolding for the `remote-test-client`)
 - #149095 (rustc-dev-guide subtree update)
 - #149108 ([AIX][ppc64le-linux-gnu] Add Amy Kwan to target maintainers)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member

looks like this failed here #149124 (comment)
@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 20, 2025
@clubby789
Copy link
Contributor Author

cc @a1phyr (rust-lang/backtrace-rs#727 seems most likely to be the change causing this). Any idea why the ABI might be mismatched?

@clubby789
Copy link
Contributor Author

@bors try jobs=x86_64-msvc-ext2

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Nov 20, 2025
Bump compiler dependencies

try-job: x86_64-msvc-ext2
@clubby789
Copy link
Contributor Author

microsoft/windows-rs#3741 / windows-link 0.2 removed the ABI overwriting behaviour, so backtrace-rs will need updating to account for that iiuc

@rust-bors
Copy link

rust-bors bot commented Nov 20, 2025

☀️ Try build successful (CI)
Build commit: 33dfedf (33dfedf8dd6863c90a4037c7c817fb47fd5e8218, parent: 7281a3bc4b89a010aed05528d648450feb8b69d3)

@clubby789 clubby789 force-pushed the cargo-update-11-11-25 branch from e7c78b5 to 36bdffe Compare November 21, 2025 16:11
@rustbot
Copy link
Collaborator

rustbot commented Nov 21, 2025

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@clubby789
Copy link
Contributor Author

@bors r=jieyouxu rollup=iffy

@bors
Copy link
Collaborator

bors commented Nov 21, 2025

📌 Commit 36bdffe has been approved by jieyouxu

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 Nov 21, 2025
@bors
Copy link
Collaborator

bors commented Nov 22, 2025

⌛ Testing commit 36bdffe with merge 5934b06...

@bors
Copy link
Collaborator

bors commented Nov 22, 2025

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 5934b06 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 22, 2025
@bors bors merged commit 5934b06 into rust-lang:main Nov 22, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 22, 2025
@github-actions
Copy link
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 27b076a (parent) -> 5934b06 (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 5934b0655768a45aad237a704995780276b91261 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. aarch64-apple: 8092.8s -> 10733.0s (+32.6%)
  2. dist-x86_64-apple: 5919.2s -> 7381.5s (+24.7%)
  3. dist-various-1: 4986.1s -> 3994.1s (-19.9%)
  4. dist-sparcv9-solaris: 6396.6s -> 5226.3s (-18.3%)
  5. dist-i586-gnu-i586-i686-musl: 6385.2s -> 5233.4s (-18.0%)
  6. dist-x86_64-solaris: 6338.5s -> 5201.1s (-17.9%)
  7. dist-powerpc64le-linux-musl: 6136.6s -> 5121.6s (-16.5%)
  8. dist-powerpc64-linux: 6095.5s -> 5092.6s (-16.5%)
  9. dist-s390x-linux: 6093.2s -> 5107.2s (-16.2%)
  10. dist-x86_64-netbsd: 5797.0s -> 4871.8s (-16.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5934b06): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.3% [-0.6%, -0.1%] 27
Improvements ✅
(secondary)
-0.4% [-1.3%, -0.1%] 36
All ❌✅ (primary) -0.3% [-0.6%, -0.1%] 27

Max RSS (memory usage)

Results (primary -2.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
1.4% [1.4%, 1.4%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-5.9% [-5.9%, -5.9%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.2% [-5.9%, 1.4%] 2

Cycles

Results (secondary 2.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
6.9% [5.7%, 8.1%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-6.6% [-6.6%, -6.6%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 473.357s -> 470.656s (-0.57%)
Artifact size: 388.90 MiB -> 388.27 MiB (-0.16%)

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

Labels

A-tidy Area: The tidy tool merged-by-bors This PR was explicitly merged by bors. 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.

9 participants