Weekly cargo update + update allowed dependencies list

[clubby789]

Fixes #145516

[rustbot]

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]

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

[samueltardieu]

Error looks spurious, restarting the job to check.

[klensy]

Need to rebase, lock file was changed.

[samueltardieu]

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.

[clubby789]

@rustbot blocked (#145858 (comment))

[bors]

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

[samueltardieu]

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

[rustbot]

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

[klensy]

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

[rustbot]

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.

[Mark-Simulacrum]

@bors r+ p=1

[bors]

📌 Commit f8807f3 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

[bors]

⌛ Testing commit f8807f3 with merge 493ab76...

[rust-log-analyzer]

The job dist-loongarch64-musl failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

error[E0425]: cannot find value `STATX_NLINK` in module `c`
  --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:81:26
   |
81 |         const NLINK = c::STATX_NLINK;
   |                          ^^^^^^^^^^^ not found in `c`
   |
help: consider importing this constant
   |
 3 + use linux_raw_sys::general::STATX_NLINK;
   |
help: if you import `STATX_NLINK`, refer to it directly
   |
81 -         const NLINK = c::STATX_NLINK;
81 +         const NLINK = STATX_NLINK;
   |

error[E0425]: cannot find value `STATX_UID` in module `c`
    --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:84:24
     |
  84 |         const UID = c::STATX_UID;
     |                        ^^^^^^^^^
     |
    ::: /rust/deps/libc-0.2.174/src/unix/linux_like/linux/mod.rs:2624:1
     |
2624 | pub const AT_UID: c_ulong = 11;
     | ------------------------- similarly named constant `AT_UID` defined here
     |
help: a constant with a similar name exists
     |
  84 -         const UID = c::STATX_UID;
  84 +         const UID = c::AT_UID;
     |
help: consider importing this constant
     |
   3 + use linux_raw_sys::general::STATX_UID;
     |
help: if you import `STATX_UID`, refer to it directly
     |
  84 -         const UID = c::STATX_UID;
  84 +         const UID = STATX_UID;
     |

error[E0425]: cannot find value `STATX_GID` in module `c`
    --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:87:24
     |
  87 |         const GID = c::STATX_GID;
     |                        ^^^^^^^^^
     |
    ::: /rust/deps/libc-0.2.174/src/unix/linux_like/linux/mod.rs:2626:1
     |
2626 | pub const AT_GID: c_ulong = 13;
     | ------------------------- similarly named constant `AT_GID` defined here
     |
help: a constant with a similar name exists
     |
  87 -         const GID = c::STATX_GID;
  87 +         const GID = c::AT_GID;
     |
help: consider importing this constant
     |
   3 + use linux_raw_sys::general::STATX_GID;
     |
help: if you import `STATX_GID`, refer to it directly
     |
  87 -         const GID = c::STATX_GID;
  87 +         const GID = STATX_GID;
     |

error[E0425]: cannot find value `STATX_ATIME` in module `c`
  --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:90:26
   |
90 |         const ATIME = c::STATX_ATIME;
   |                          ^^^^^^^^^^^ not found in `c`
   |
help: consider importing this constant
   |
 3 + use linux_raw_sys::general::STATX_ATIME;
   |
help: if you import `STATX_ATIME`, refer to it directly
   |
90 -         const ATIME = c::STATX_ATIME;
90 +         const ATIME = STATX_ATIME;
   |

error[E0425]: cannot find value `STATX_MTIME` in module `c`
  --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:93:26
   |
93 |         const MTIME = c::STATX_MTIME;
   |                          ^^^^^^^^^^^ not found in `c`
   |
help: consider importing this constant
   |
 3 + use linux_raw_sys::general::STATX_MTIME;
   |
help: if you import `STATX_MTIME`, refer to it directly
   |
93 -         const MTIME = c::STATX_MTIME;
93 +         const MTIME = STATX_MTIME;
   |

error[E0425]: cannot find value `STATX_CTIME` in module `c`
  --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:96:26
   |
---

error[E0425]: cannot find value `STATX_INO` in module `c`
   --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:99:24
    |
 99 |         const INO = c::STATX_INO;
    |                        ^^^^^^^^^
    |
   ::: /rust/deps/libc-0.2.174/src/unix/linux_like/linux/musl/mod.rs:787:1
    |
787 | pub const STA_INS: c_int = 0x0010;
    | ------------------------ similarly named constant `STA_INS` defined here
    |
help: a constant with a similar name exists
    |
 99 -         const INO = c::STATX_INO;
 99 +         const INO = c::STA_INS;
    |
help: consider importing this constant
    |
  3 + use linux_raw_sys::general::STATX_INO;
    |
help: if you import `STATX_INO`, refer to it directly
    |
 99 -         const INO = c::STATX_INO;
 99 +         const INO = STATX_INO;
    |

error[E0425]: cannot find value `STATX_SIZE` in module `c`
   --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:102:25
    |
---

error[E0425]: cannot find value `STATX_BTIME` in module `c`
   --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:111:26
    |
111 |         const BTIME = c::STATX_BTIME;
    |                          ^^^^^^^^^^^ not found in `c`
    |
help: consider importing this constant
    |
  3 + use linux_raw_sys::general::STATX_BTIME;
    |
help: if you import `STATX_BTIME`, refer to it directly
    |
111 -         const BTIME = c::STATX_BTIME;
111 +         const BTIME = STATX_BTIME;
    |

error[E0425]: cannot find value `STATX_MNT_ID` in module `c`
   --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:114:27
    |
114 |         const MNT_ID = c::STATX_MNT_ID;
    |                           ^^^^^^^^^^^^ not found in `c`
    |
help: consider importing this constant
    |
  3 + use linux_raw_sys::general::STATX_MNT_ID;
    |
help: if you import `STATX_MNT_ID`, refer to it directly
    |
114 -         const MNT_ID = c::STATX_MNT_ID;
114 +         const MNT_ID = STATX_MNT_ID;
    |

error[E0425]: cannot find value `STATX_DIOALIGN` in module `c`
   --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:117:29
    |
117 |         const DIOALIGN = c::STATX_DIOALIGN;
    |                             ^^^^^^^^^^^^^^ not found in `c`
    |
help: consider importing this constant
    |
  3 + use linux_raw_sys::general::STATX_DIOALIGN;
    |
help: if you import `STATX_DIOALIGN`, refer to it directly
    |
117 -         const DIOALIGN = c::STATX_DIOALIGN;
117 +         const DIOALIGN = STATX_DIOALIGN;
    |

error[E0425]: cannot find value `STATX_ALL` in module `c`
   --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:120:24
    |
120 |         const ALL = c::STATX_ALL;
    |                        ^^^^^^^^^
    |
   ::: /rust/deps/libc-0.2.174/src/unix/linux_like/linux/musl/mod.rs:786:1
    |
786 | pub const STA_FLL: c_int = 0x0008;
    | ------------------------ similarly named constant `STA_FLL` defined here
    |
help: a constant with a similar name exists
    |
120 -         const ALL = c::STATX_ALL;
120 +         const ALL = c::STA_FLL;
    |
help: consider importing this constant
    |
  3 + use linux_raw_sys::general::STATX_ALL;
    |
---

error[E0425]: cannot find value `STATX_ATTR_NODUMP` in module `c`
   --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:142:27
    |
142 |         const NODUMP = c::STATX_ATTR_NODUMP as u64;
    |                           ^^^^^^^^^^^^^^^^^ not found in `c`
    |
help: consider importing this constant
    |
  3 + use linux_raw_sys::general::STATX_ATTR_NODUMP;
    |
help: if you import `STATX_ATTR_NODUMP`, refer to it directly
    |
142 -         const NODUMP = c::STATX_ATTR_NODUMP as u64;
142 +         const NODUMP = STATX_ATTR_NODUMP as u64;
    |

error[E0425]: cannot find value `STATX_ATTR_ENCRYPTED` in module `c`
   --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:145:30
    |
---
help: consider importing this constant
    |
  3 + use linux_raw_sys::general::STATX_ATTR_AUTOMOUNT;
    |
help: if you import `STATX_ATTR_AUTOMOUNT`, refer to it directly
    |
148 -         const AUTOMOUNT = c::STATX_ATTR_AUTOMOUNT as u64;
148 +         const AUTOMOUNT = STATX_ATTR_AUTOMOUNT as u64;
    |

---

error[E0425]: cannot find value `STATX_ATTR_DAX` in module `c`
   --> /rust/deps/rustix-1.1.2/src/fs/statx.rs:157:24
    |
157 |         const DAX = c::STATX_ATTR_DAX as u64;
    |                        ^^^^^^^^^^^^^^ not found in `c`
    |
help: consider importing this constant
    |
  3 + use linux_raw_sys::general::STATX_ATTR_DAX;
    |
help: if you import `STATX_ATTR_DAX`, refer to it directly
    |
157 -         const DAX = c::STATX_ATTR_DAX as u64;
157 +         const DAX = STATX_ATTR_DAX as u64;
    |

[RUSTC-TIMING] thin_vec test:false 0.450
   Compiling rustc_serialize v0.0.0 (/checkout/compiler/rustc_serialize)
[RUSTC-TIMING] rustc_serialize test:false 0.590

[bors]

💔 Test failed - checks-actions

[Mark-Simulacrum]

@rustbot author

It probably makes sense to split this up into smaller chunks to make it easier to make incremental progress.

[clubby789]

Sounds good. I believe this issue is in library with the libc bump - a reocurrence of bytecodealliance/rustix#1496 which I will look into fixing

[bjorn3]

wit-bindgen@0.46.0 contains a binary blob. It seems like we accidentally already got a dependency on this blob for the standard library again though.

[bjorn3]

cc @alexcrichton this was added to the standard library in #145944

[alexcrichton]

Ah yes the binary blob there is expected, and I'm happy to provide context for it if necessary. (unsure if you were looking for any other sort of particular feedback here)

[bjorn3]

My understanding is that we intended to pin wit-bindgen-rt to a version from before the binary blob was introduced because some distros don't like binary blobs in source tarballs. I assume the reason you are using a binary blob is because of weak symbols. Would something like the binary blobs into a separate crate and then replacing this crate on the rustc side with [patch.crates-io] with a pure rust implementation that uses the unstable #[linkage = "weak"] or something like that work?

[alexcrichton]

You're right yeah the blobs are just for weak symbols. Personally if it comes down to [patch] what I'd personally prefer is to not support building WASI targets for distros. For example remove all of the blobs from the vendored source tarball and then have the WASI target just fail to build. Basically I personally don't want to sink too much effort into fixing this myself, so I'd try to play the game of "what's the lowest effort fix that satisfies everyone", and AFAIK there aren't users wanting to build wasi targets from distros.