Skip to content

Rollup of 8 pull requests #139826

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

Merged
bors merged 28 commits into from
Apr 15, 2025
Merged

Rollup of 8 pull requests #139826

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5cda2a9
run all 'thread' tests on FreeBSD, and also on 32bit
RalfJung Apr 10, 2025
f254ab2
Merge pull request #4266 from RalfJung/freebsd
RalfJung Apr 10, 2025
2d37173
Bump crossbeam-channel from 0.5.14 to 0.5.15
dependabot[bot] Apr 10, 2025
d1f901a
Merge pull request #4267 from rust-lang/dependabot/cargo/crossbeam-ch…
RalfJung Apr 10, 2025
f243cb8
Implement RtlNtStatusToDosError and shim test for it
CraftSpider Apr 10, 2025
7284100
Merge pull request #4261 from CraftSpider/windows-rtl-to-dos
RalfJung Apr 10, 2025
49cc860
fix build fail on macos bacause of libffi-sys 2.3.0; This updates lib…
LorrensP-2158466 Apr 11, 2025
52b204e
Merge pull request #4268 from LorrensP-2158466/update-libffi
saethlin Apr 11, 2025
c462002
Preparing for merge from rustc
Apr 12, 2025
352545f
Merge from rustc
Apr 12, 2025
59a3730
fmt
Apr 12, 2025
1f8cb69
Merge pull request #4270 from rust-lang/rustup-2025-04-12
oli-obk Apr 12, 2025
86e2a07
opt-dist: use executable-extension for host llvm-profdata
ognevny Apr 12, 2025
ed5f31a
Avoid unused clones in Cloned<I> and Copied<I>
thaliaarchi Apr 13, 2025
f3344ef
tests: use `compiletest-ignore-dir` for bootstrap self-tests
jieyouxu Apr 14, 2025
6a8718c
Add test for issue 34834
reddevilmidzy Apr 14, 2025
1b46969
Specify `--print info=file` syntax in `--help`
clubby789 Apr 14, 2025
758e99a
update lockfile
RalfJung Apr 14, 2025
4b63362
Use `newtype_index!`-generated types more idiomatically
yotamofek Apr 14, 2025
cb22c1d
Allow (but don't require) `#[unsafe(naked)]` so that `compiler-builti…
folkertdev Apr 14, 2025
efca25f
Rollup merge of #139745 - thaliaarchi:iter-unused-clone-copy, r=joboet
matthiaskrgr Apr 14, 2025
9b564df
Rollup merge of #139757 - ognevny:opt-dist-hostllvm, r=Kobzol
matthiaskrgr Apr 14, 2025
bf247c7
Rollup merge of #139778 - reddevilmidzy:add-success-test, r=lcnr
matthiaskrgr Apr 14, 2025
6b3531e
Rollup merge of #139783 - jieyouxu:ignore-dir, r=Zalathar
matthiaskrgr Apr 14, 2025
1bceed8
Rollup merge of #139797 - folkertdev:naked-allow-unsafe, r=tgross35
matthiaskrgr Apr 14, 2025
7dc3fec
Rollup merge of #139799 - clubby789:print=file, r=jieyouxu
matthiaskrgr Apr 14, 2025
04d1052
Rollup merge of #139811 - yotamofek:pr/newtype_cleanups, r=oli-obk
matthiaskrgr Apr 14, 2025
8587c95
Rollup merge of #139813 - RalfJung:miri-sync, r=RalfJung
matthiaskrgr Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix build fail on macos bacause of libffi-sys 2.3.0; This updates lib… 
…ffi to new major version
  • Loading branch information
@LorrensP-2158466
LorrensP-2158466 committed Apr 11, 2025
commit 49cc8601821b614aa7a245dd37a837ec92192d3a
8 changes: 4 additions & 4 deletions src/tools/miri/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,19 +436,19 @@ checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"

[[package]]
name = "libffi"
version = "3.2.0"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2"
checksum = "4a9434b6fc77375fb624698d5f8c49d7e80b10d59eb1219afda27d1f824d4074"
dependencies = [
"libc",
"libffi-sys",
]

[[package]]
name = "libffi-sys"
version = "2.3.0"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36115160c57e8529781b4183c2bb51fdc1f6d6d1ed345591d84be7703befb3c"
checksum = "ead36a2496acfc8edd6cc32352110e9478ac5b9b5f5b9856ebd3d28019addb84"
dependencies = [
"cc",
]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ features = ['unprefixed_malloc_on_supported_platforms']

[target.'cfg(unix)'.dependencies]
libc = "0.2"
libffi = "3.2.0"
libffi = "4.0.0"
libloading = "0.8"

[target.'cfg(target_family = "windows")'.dependencies]
Expand Down