Skip to content

Conversation

clubby789
Copy link
Contributor

Fixes #145516

@rustbot
Copy link
Collaborator

rustbot commented Aug 25, 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

@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 Aug 25, 2025
@rustbot
Copy link
Collaborator

rustbot commented Aug 25, 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.

These commits modify the library/Cargo.lock file. Unintentional changes to library/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

@rust-log-analyzer

This comment has been minimized.

@samueltardieu
Copy link
Member

samueltardieu commented Aug 25, 2025

Error looks spurious, restarting the job to check.

@klensy
Copy link
Contributor

klensy commented Aug 25, 2025

Need to rebase, lock file was changed.

@samueltardieu
Copy link
Member

Need to rebase, lock file was changed.

Ok, I canceled the rerun job then, no need to waste CPU cycles if it will run again anyway.

@rustbot

This comment has been minimized.

@clubby789
Copy link
Contributor Author

@rustbot blocked (#145858 (comment))

@rustbot rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 25, 2025
@bors
Copy link
Collaborator

bors commented Aug 26, 2025

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

@samueltardieu
Copy link
Member

samueltardieu commented Aug 26, 2025

@clubby789 #145858 is merged, you may rebase
@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Aug 26, 2025
@rustbot
Copy link
Collaborator

rustbot commented Aug 26, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@rustbot

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@clubby789 clubby789 closed this Aug 27, 2025
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 27, 2025
@clubby789 clubby789 reopened this Aug 27, 2025
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 27, 2025
@rust-log-analyzer

This comment has been minimized.

@klensy
Copy link
Contributor

klensy commented Aug 27, 2025

Oh, yes, stringdex is tested to recover perf in #145911, so shouldn't be bumped.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-bors
Copy link

rust-bors bot commented Sep 10, 2025

💔 Test for 7557d75 failed: CI. Failed jobs:

@clubby789
Copy link
Contributor Author

Looks like one of the bumps (rustfix?) has improved and removed some duplication in .fixed files

@klensy
Copy link
Contributor

klensy commented Sep 15, 2025

Yes, #146605

@clubby789
Copy link
Contributor Author

@rustbot ready
We can either land this now, or after 146605 has gone through if doing that in its own PR is preferred

@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 Sep 16, 2025
@jyn514
Copy link
Member

jyn514 commented Sep 16, 2025

I'm going to merge my PR first if that's ok, it will make some things easier for me downstream in Ferrocene and it sounds like the bindgen thing might take another round of review.

@bors
Copy link
Collaborator

bors commented Sep 19, 2025

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

@rustbot

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@klensy
Copy link
Contributor

klensy commented Sep 23, 2025

this fail fixed in #146731

@Mark-Simulacrum Mark-Simulacrum 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 Oct 1, 2025
@rustbot

This comment has been minimized.

@clubby789
Copy link
Contributor Author

@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 Oct 6, 2025
@rust-log-analyzer

This comment has been minimized.

Cargo.lock Outdated
Comment on lines 5244 to 5240
version = "0.0.1-alpha10"
version = "0.0.1-alpha9"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bad rebase?

Copy link
Contributor Author

@clubby789 clubby789 Oct 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think lexicographic sorting is leading to alpha10 being treated as the version between alpha1 and alpha2, so cargo update pulls in the 'newest' version, alpha9
image
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @notriddle I think the version name might need updating

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch, good point.

The = version is fine for now. I'll switch to 0.0.2 next time I push an update.

@bors
Copy link
Collaborator

bors commented Oct 7, 2025

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

compiler dependencies:
    Updating addr2line v0.24.2 -> v0.25.1
    Removing android-tzdata v0.1.1
    Updating anstream v0.6.20 -> v0.6.21
    Updating anstyle v1.0.11 -> v1.0.13
    Updating anyhow v1.0.99 -> v1.0.100
    Updating backtrace v0.3.75 -> v0.3.76
    Updating bitflags v2.9.3 -> v2.9.4
    Updating camino v1.1.11 -> v1.2.1
    Updating cfg-if v1.0.1 -> v1.0.3
    Updating chrono v0.4.41 -> v0.4.42
    Updating clap v4.5.45 -> v4.5.48
    Updating clap_builder v4.5.44 -> v4.5.48
    Updating clap_derive v4.5.45 -> v4.5.47
    Updating ctrlc v3.4.7 -> v3.5.0
    Updating cxx v1.0.185 -> v1.0.186
    Updating cxx-build v1.0.185 -> v1.0.186
    Updating cxxbridge-cmd v1.0.185 -> v1.0.186
    Updating cxxbridge-flags v1.0.185 -> v1.0.186
    Updating cxxbridge-macro v1.0.185 -> v1.0.186
    Updating dbus v0.9.7 -> v0.9.9
      Adding dispatch v0.2.0
    Updating dyn-clone v1.0.19 -> v1.0.20
    Updating erased-serde v0.4.6 -> v0.4.8
    Updating errno v0.3.13 -> v0.3.14
    Updating filetime v0.2.25 -> v0.2.26
    Updating find-msvc-tools v0.1.2 -> v0.1.3
    Updating flate2 v1.1.2 -> v1.1.4
    Updating form_urlencoded v1.2.1 -> v1.2.2
    Updating gimli v0.32.0 -> v0.32.3
      Adding hashbrown v0.16.0
    Updating humantime v2.2.0 -> v2.3.0
    Updating iana-time-zone v0.1.63 -> v0.1.64
    Updating idna v1.0.3 -> v1.1.0
    Updating ipc-channel v0.20.1 -> v0.20.2
    Updating jobserver v0.1.33 -> v0.1.34
    Updating js-sys v0.3.77 -> v0.3.81
    Updating libdbus-sys v0.2.5 -> v0.2.6
    Updating libffi v4.1.1 -> v4.1.2
    Updating libffi-sys v3.3.2 -> v3.3.3
    Updating libloading v0.8.8 -> v0.8.9
    Updating libredox v0.1.9 -> v0.1.10
    Updating linux-raw-sys v0.9.4 -> v0.11.0
    Updating lock_api v0.4.13 -> v0.4.14
    Updating log v0.4.27 -> v0.4.28
    Updating matchers v0.1.0 -> v0.2.0
    Updating memchr v2.7.5 -> v2.7.6
    Updating normpath v1.3.0 -> v1.5.0
    Removing nu-ansi-term v0.46.0
    Updating objc2-core-foundation v0.3.1 -> v0.3.2
    Updating objc2-io-kit v0.3.1 -> v0.3.2
    Removing overload v0.1.1
    Updating owo-colors v4.2.2 -> v4.2.3
    Updating parking_lot v0.12.4 -> v0.12.5
    Updating parking_lot_core v0.9.11 -> v0.9.12
    Updating percent-encoding v2.3.1 -> v2.3.2
    Updating pest v2.8.1 -> v2.8.3
    Updating pest_derive v2.8.1 -> v2.8.3
    Updating pest_generator v2.8.1 -> v2.8.3
    Updating pest_meta v2.8.1 -> v2.8.3
    Updating potential_utf v0.1.2 -> v0.1.3
    Updating quote v1.0.40 -> v1.0.41
    Updating redox_syscall v0.5.17 -> v0.5.18
    Updating ref-cast v1.0.24 -> v1.0.25
    Updating ref-cast-impl v1.0.24 -> v1.0.25
    Updating regex v1.11.1 -> v1.11.3
    Removing regex-automata v0.1.10
    Removing regex-automata v0.4.9
      Adding regex-automata v0.4.11
    Updating regex-lite v0.1.6 -> v0.1.7
    Removing regex-syntax v0.6.29
    Removing regex-syntax v0.8.5
      Adding regex-syntax v0.8.6
    Updating rustix v1.0.8 -> v1.1.2
    Updating schannel v0.1.27 -> v0.1.28
    Updating semver v1.0.26 -> v1.0.27
    Updating serde-untagged v0.1.8 -> v0.1.9
    Updating serde_json v1.0.142 -> v1.0.145
    Updating serde_path_to_error v0.1.17 -> v0.1.20
      Adding simd-adler32 v0.3.7
    Updating sysinfo v0.37.0 -> v0.37.2
    Updating tempfile v3.20.0 -> v3.23.0
    Updating thiserror v2.0.15 -> v2.0.17
    Updating thiserror-impl v2.0.15 -> v2.0.17
    Updating tinyvec v1.9.0 -> v1.10.0
    Updating tracing-subscriber v0.3.18 -> v0.3.20
    Updating twox-hash v2.1.1 -> v2.1.2
    Updating typenum v1.18.0 -> v1.19.0
    Updating unicode-ident v1.0.18 -> v1.0.19
    Updating unicode-width v0.2.1 -> v0.2.2
    Updating url v2.5.4 -> v2.5.7
    Updating uuid v1.18.0 -> v1.18.1
    Updating wasi v0.14.2+wasi-0.2.4 -> v0.14.7+wasi-0.2.4
    Updating wasi-preview1-component-adapter-provider v36.0.1 -> v36.0.2
      Adding wasip2 v1.0.1+wasi-0.2.4
    Updating wasm-bindgen v0.2.100 -> v0.2.104
    Updating wasm-bindgen-backend v0.2.100 -> v0.2.104
    Updating wasm-bindgen-macro v0.2.100 -> v0.2.104
    Updating wasm-bindgen-macro-support v0.2.100 -> v0.2.104
    Updating wasm-bindgen-shared v0.2.100 -> v0.2.104
    Updating winapi-util v0.1.9 -> v0.1.11
    Removing windows v0.58.0
    Updating windows-core v0.58.0 -> v0.62.2
    Removing windows-implement v0.58.0
    Removing windows-implement v0.60.0
      Adding windows-implement v0.60.2
    Removing windows-interface v0.58.0
    Removing windows-interface v0.59.1
      Adding windows-interface v0.59.3
      Adding windows-link v0.2.1
    Updating windows-result v0.2.0 -> v0.4.1
    Updating windows-strings v0.1.0 -> v0.5.1
      Adding windows-sys v0.61.2
    Updating windows-targets v0.53.3 -> v0.53.5
    Updating windows_aarch64_gnullvm v0.53.0 -> v0.53.1
    Updating windows_aarch64_msvc v0.53.0 -> v0.53.1
    Updating windows_i686_gnu v0.53.0 -> v0.53.1
    Updating windows_i686_gnullvm v0.53.0 -> v0.53.1
    Updating windows_i686_msvc v0.53.0 -> v0.53.1
    Updating windows_x86_64_gnu v0.53.0 -> v0.53.1
    Updating windows_x86_64_gnullvm v0.53.0 -> v0.53.1
    Updating windows_x86_64_msvc v0.53.0 -> v0.53.1
      Adding wit-bindgen v0.46.0
    Removing wit-bindgen-rt v0.39.0
    Updating xattr v1.5.1 -> v1.6.1
    Updating zerocopy v0.8.26 -> v0.8.27
    Updating zerocopy-derive v0.8.26 -> v0.8.27

library dependencies:
    Updating addr2line v0.25.0 -> v0.25.1
    Updating cfg-if v1.0.1 -> v1.0.3
    Updating dlmalloc v0.2.10 -> v0.2.11
    Updating gimli v0.32.0 -> v0.32.3
    Updating libc v0.2.175 -> v0.2.176
    Updating memchr v2.7.5 -> v2.7.6
    Updating vex-sdk v0.27.0 -> v0.27.1
      Adding windows-link v0.2.1
    Updating windows-sys v0.59.0 -> v0.60.2
    Updating windows-targets v0.52.6 -> v0.53.5
    Updating windows_aarch64_gnullvm v0.52.6 -> v0.53.1
    Updating windows_aarch64_msvc v0.52.6 -> v0.53.1
    Updating windows_i686_gnu v0.52.6 -> v0.53.1
    Updating windows_i686_gnullvm v0.52.6 -> v0.53.1
    Updating windows_i686_msvc v0.52.6 -> v0.53.1
    Updating windows_x86_64_gnu v0.52.6 -> v0.53.1
    Updating windows_x86_64_gnullvm v0.52.6 -> v0.53.1
    Updating windows_x86_64_msvc v0.52.6 -> v0.53.1
    Updating wit-bindgen v0.45.0 -> v0.45.1

rustbook dependencies:
    Updating crates.io index
     Locking 82 packages to latest compatible versions
    Updating ammonia v4.1.1 -> v4.1.2
    Removing android-tzdata v0.1.1
    Updating anstream v0.6.20 -> v0.6.21
    Updating anstyle v1.0.11 -> v1.0.13
    Updating anyhow v1.0.99 -> v1.0.100
    Removing bitflags v1.3.2
    Removing bitflags v2.9.2
      Adding bitflags v2.9.4
    Updating cc v1.2.33 -> v1.2.40
    Updating cfg-if v1.0.1 -> v1.0.3
    Updating chrono v0.4.41 -> v0.4.42
    Updating clap v4.5.45 -> v4.5.48
    Updating clap_builder v4.5.44 -> v4.5.48
    Updating clap_complete v4.5.57 -> v4.5.58
    Updating clap_derive v4.5.45 -> v4.5.47
    Updating errno v0.3.13 -> v0.3.14
      Adding find-msvc-tools v0.1.3
    Updating flate2 v1.1.2 -> v1.1.4
    Updating form_urlencoded v1.2.1 -> v1.2.2
    Updating getopts v0.2.23 -> v0.2.24
    Updating hashbrown v0.15.5 -> v0.16.0
    Updating iana-time-zone v0.1.63 -> v0.1.64
    Updating idna v1.0.3 -> v1.1.0
    Updating indexmap v2.10.0 -> v2.11.4
    Updating js-sys v0.3.77 -> v0.3.81
    Updating linux-raw-sys v0.9.4 -> v0.11.0
    Updating lock_api v0.4.13 -> v0.4.14
    Updating log v0.4.27 -> v0.4.28
    Updating memchr v2.7.5 -> v2.7.6
    Updating normpath v1.3.0 -> v1.5.0
    Updating opener v0.8.2 -> v0.8.3
    Updating parking_lot v0.12.4 -> v0.12.5
    Updating parking_lot_core v0.9.11 -> v0.9.12
    Updating percent-encoding v2.3.1 -> v2.3.2
    Updating pest v2.8.1 -> v2.8.3
    Updating pest_derive v2.8.1 -> v2.8.3
    Updating pest_generator v2.8.1 -> v2.8.3
    Updating pest_meta v2.8.1 -> v2.8.3
    Updating potential_utf v0.1.2 -> v0.1.3
    Updating quote v1.0.40 -> v1.0.41
    Updating redox_syscall v0.5.17 -> v0.5.18
    Updating regex v1.11.1 -> v1.11.3
    Updating regex-automata v0.4.9 -> v0.4.11
    Updating regex-syntax v0.8.5 -> v0.8.6
    Updating rustix v1.0.8 -> v1.1.2
    Updating semver v1.0.26 -> v1.0.27
    Updating serde v1.0.219 -> v1.0.228
      Adding serde_core v1.0.228
    Updating serde_derive v1.0.219 -> v1.0.228
    Updating serde_json v1.0.142 -> v1.0.145
      Adding simd-adler32 v0.3.7
    Updating syntect v5.2.0 -> v5.3.0
    Updating tempfile v3.20.0 -> v3.23.0
    Updating thiserror v2.0.15 -> v2.0.17
    Updating thiserror-impl v2.0.15 -> v2.0.17
    Updating typenum v1.18.0 -> v1.19.0
    Updating unicode-ident v1.0.18 -> v1.0.19
    Updating unicode-width v0.2.1 -> v0.2.2
    Updating url v2.5.4 -> v2.5.7
    Updating wasi v0.14.2+wasi-0.2.4 -> v0.14.7+wasi-0.2.4
      Adding wasip2 v1.0.1+wasi-0.2.4
    Updating wasm-bindgen v0.2.100 -> v0.2.104
    Updating wasm-bindgen-backend v0.2.100 -> v0.2.104
    Updating wasm-bindgen-macro v0.2.100 -> v0.2.104
    Updating wasm-bindgen-macro-support v0.2.100 -> v0.2.104
    Updating wasm-bindgen-shared v0.2.100 -> v0.2.104
    Updating winapi-util v0.1.9 -> v0.1.11
    Updating windows-core v0.61.2 -> v0.62.2
    Updating windows-implement v0.60.0 -> v0.60.2
    Updating windows-interface v0.59.1 -> v0.59.3
    Updating windows-link v0.1.3 -> v0.2.1
    Updating windows-result v0.3.4 -> v0.4.1
    Updating windows-strings v0.4.2 -> v0.5.1
    Updating windows-sys v0.59.0 -> v0.61.2
    Removing windows-targets v0.52.6
    Removing windows-targets v0.53.3
      Adding windows-targets v0.53.5
    Removing windows_aarch64_gnullvm v0.52.6
    Removing windows_aarch64_gnullvm v0.53.0
      Adding windows_aarch64_gnullvm v0.53.1
    Removing windows_aarch64_msvc v0.52.6
    Removing windows_aarch64_msvc v0.53.0
      Adding windows_aarch64_msvc v0.53.1
    Removing windows_i686_gnu v0.52.6
    Removing windows_i686_gnu v0.53.0
      Adding windows_i686_gnu v0.53.1
    Removing windows_i686_gnullvm v0.52.6
    Removing windows_i686_gnullvm v0.53.0
      Adding windows_i686_gnullvm v0.53.1
    Removing windows_i686_msvc v0.52.6
    Removing windows_i686_msvc v0.53.0
      Adding windows_i686_msvc v0.53.1
    Removing windows_x86_64_gnu v0.52.6
    Removing windows_x86_64_gnu v0.53.0
      Adding windows_x86_64_gnu v0.53.1
    Removing windows_x86_64_gnullvm v0.52.6
    Removing windows_x86_64_gnullvm v0.53.0
      Adding windows_x86_64_gnullvm v0.53.1
    Removing windows_x86_64_msvc v0.52.6
    Removing windows_x86_64_msvc v0.53.0
      Adding windows_x86_64_msvc v0.53.1
    Updating winnow v0.7.12 -> v0.7.13
      Adding wit-bindgen v0.46.0
    Removing wit-bindgen-rt v0.39.0
note: pass `--verbose` to see 1 unchanged dependencies behind latest
@rustbot
Copy link
Collaborator

rustbot commented Oct 7, 2025

This PR was rebased onto a different master 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.

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 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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants