Skip to content

Commit 37338b8

Browse files
authored
Rollup merge of #108500 - RalfJung:miri, r=RalfJung
update Miri r? ``@ghost``
2 parents c813994 + 3f88f4c commit 37338b8

File tree

28 files changed

+274
-55
lines changed

28 files changed

+274
-55
lines changed

Cargo.lock

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ dependencies = [
444444
"directories",
445445
"rustc-build-sysroot",
446446
"rustc-workspace-hack",
447-
"rustc_tools_util 0.2.1",
447+
"rustc_tools_util",
448448
"rustc_version",
449449
"serde",
450450
"serde_json",
@@ -738,7 +738,7 @@ dependencies = [
738738
"regex",
739739
"rustc-semver",
740740
"rustc-workspace-hack",
741-
"rustc_tools_util 0.3.0",
741+
"rustc_tools_util",
742742
"semver",
743743
"serde",
744744
"syn",
@@ -4725,12 +4725,6 @@ dependencies = [
47254725
"tracing",
47264726
]
47274727

4728-
[[package]]
4729-
name = "rustc_tools_util"
4730-
version = "0.2.1"
4731-
source = "registry+https://github.com/rust-lang/crates.io-index"
4732-
checksum = "598f48ce2a421542b3e64828aa742b687cc1b91d2f96591cfdb7ac5988cd6366"
4733-
47344728
[[package]]
47354729
name = "rustc_tools_util"
47364730
version = "0.3.0"

src/tools/miri/CONTRIBUTING.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,13 @@ josh-proxy --local=$HOME/.cache/josh --remote=https://github.com --no-background
242242

243243
This uses a directory `$HOME/.cache/josh` as a cache, to speed up repeated pulling/pushing.
244244

245+
To make josh push via ssh instead of https, you can add the following to your `.gitconfig`:
246+
247+
```toml
248+
[url "git@github.com:"]
249+
pushInsteadOf = https://github.com/
250+
```
251+
245252
### Importing changes from the rustc repo
246253

247254
Josh needs to be running, as described above.

src/tools/miri/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,9 @@ degree documented below):
213213
- The best-supported target is `x86_64-unknown-linux-gnu`. Miri releases are
214214
blocked on things working with this target. Most other Linux targets should
215215
also work well; we do run the test suite on `i686-unknown-linux-gnu` as a
216-
32bit target and `mips64-unknown-linux-gnuabi64` as a big-endian target.
216+
32bit target and `mips64-unknown-linux-gnuabi64` as a big-endian target, as
217+
well as the ARM targets `aarch64-unknown-linux-gnu` and
218+
`arm-unknown-linux-gnueabi`.
217219
- `x86_64-apple-darwin` should work basically as well as Linux. We also test
218220
`aarch64-apple-darwin`. However, we might ship Miri with a nightly even when
219221
some features on these targets regress.
@@ -590,7 +592,7 @@ extern "Rust" {
590592
/// `out` must point to at least `out_size` many bytes, and the result will be stored there
591593
/// with a null terminator.
592594
/// Returns 0 if the `out` buffer was large enough, and the required size otherwise.
593-
fn miri_host_to_target_path(path: *const i8, out: *mut i8, out_size: usize) -> usize;
595+
fn miri_host_to_target_path(path: *const std::ffi::c_char, out: *mut std::ffi::c_char, out_size: usize) -> usize;
594596
}
595597
```
596598

src/tools/miri/cargo-miri/Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb"
193193

194194
[[package]]
195195
name = "rustc_tools_util"
196-
version = "0.2.1"
196+
version = "0.3.0"
197197
source = "registry+https://github.com/rust-lang/crates.io-index"
198-
checksum = "598f48ce2a421542b3e64828aa742b687cc1b91d2f96591cfdb7ac5988cd6366"
198+
checksum = "8ba09476327c4b70ccefb6180f046ef588c26a24cf5d269a9feba316eb4f029f"
199199

200200
[[package]]
201201
name = "rustc_version"

src/tools/miri/cargo-miri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ rustc-workspace-hack = "1.0.0"
3030
serde = { version = "*", features = ["derive"] }
3131

3232
[build-dependencies]
33-
rustc_tools_util = "0.2"
33+
rustc_tools_util = "0.3"

src/tools/miri/cargo-miri/build.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,5 @@ fn main() {
22
// Don't rebuild miri when nothing changed.
33
println!("cargo:rerun-if-changed=build.rs");
44
// gather version info
5-
println!(
6-
"cargo:rustc-env=GIT_HASH={}",
7-
rustc_tools_util::get_commit_hash().unwrap_or_default()
8-
);
9-
println!(
10-
"cargo:rustc-env=COMMIT_DATE={}",
11-
rustc_tools_util::get_commit_date().unwrap_or_default()
12-
);
5+
rustc_tools_util::setup_version_info!();
136
}

src/tools/miri/ci.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ run_tests
104104
case $HOST_TARGET in
105105
x86_64-unknown-linux-gnu)
106106
MIRI_TEST_TARGET=i686-unknown-linux-gnu run_tests
107+
MIRI_TEST_TARGET=aarch64-unknown-linux-gnu run_tests
107108
MIRI_TEST_TARGET=aarch64-apple-darwin run_tests
108109
MIRI_TEST_TARGET=i686-pc-windows-msvc run_tests
109110
MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec panic/panic concurrency/simple atomic data_race env/var
@@ -118,6 +119,7 @@ case $HOST_TARGET in
118119
MIRI_TEST_TARGET=x86_64-pc-windows-msvc run_tests
119120
;;
120121
i686-pc-windows-msvc)
122+
MIRI_TEST_TARGET=arm-unknown-linux-gnueabi run_tests
121123
MIRI_TEST_TARGET=x86_64-unknown-linux-gnu run_tests
122124
MIRI_TEST_TARGET=x86_64-pc-windows-gnu run_tests
123125
;;

src/tools/miri/rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c54c8cbac882e149e04a9e1f2d146fd548ae30ae
1+
c4e0cd966062ca67daed20775f4e8a60c28e57df

src/tools/miri/src/borrow_tracker/stacked_borrows/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ impl NewPermission {
148148
NewPermission::Uniform {
149149
perm: Permission::Unique,
150150
access: Some(AccessKind::Write),
151-
protector: (kind == RetagKind::FnEntry)
152-
.then_some(ProtectorKind::WeakProtector),
151+
protector: (kind == RetagKind::FnEntry).then_some(ProtectorKind::WeakProtector),
153152
}
154153
} else {
155154
// `!Unpin` boxes do not get `noalias` nor `dereferenceable`.

src/tools/miri/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#![allow(
1414
clippy::collapsible_else_if,
1515
clippy::collapsible_if,
16+
clippy::if_same_then_else,
1617
clippy::comparison_chain,
1718
clippy::enum_variant_names,
1819
clippy::field_reassign_with_default,
@@ -21,7 +22,7 @@
2122
clippy::single_match,
2223
clippy::useless_format,
2324
clippy::derive_partial_eq_without_eq,
24-
clippy::derive_hash_xor_eq,
25+
clippy::derived_hash_with_manual_eq,
2526
clippy::too_many_arguments,
2627
clippy::type_complexity,
2728
clippy::single_element_loop,

0 commit comments

Comments
 (0)