diff options
| author | bors <bors@rust-lang.org> | 2025-02-25 05:41:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-25 05:41:34 +0000 |
| commit | ad27045c31a9f37ad7d44ca2a403de52d1a896d3 (patch) | |
| tree | 6c7e874e179133af18c4b8a1998ecf9b44a02d6c /src | |
| parent | f5729cfed3c45e061e8a443677fc1d5ef9277df7 (diff) | |
| parent | 91dc3eed50e2ac5c22c80c3c5129f0dbc818c67c (diff) | |
Auto merge of #137571 - tgross35:rollup-i1tcnv1, r=tgross35
Rollup of 8 pull requests Successful merges: - #134655 (Stabilize `hash_extract_if`) - #135933 (Explain how Vec::with_capacity is faithful) - #136668 (Stabilize `core::str::from_utf8_mut` as `const`) - #136775 (Update `String::from_raw_parts` safety requirements) - #137109 (stabilize extract_if) - #137349 (Implement `read_buf` for zkVM stdin) - #137493 (configure.py: don't instruct user to run nonexistent program) - #137516 (remove some unnecessary rustc_const_unstable) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rwxr-xr-x | src/bootstrap/configure.py | 2 | ||||
| -rw-r--r-- | src/tools/miri/src/lib.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py index ac971a64d7c..e3f58d97cbc 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py @@ -776,6 +776,6 @@ if __name__ == "__main__": f.write(contents) p("") - p("run `python {}/x.py --help`".format(rust_dir)) + p("run `{} {}/x.py --help`".format(os.path.basename(sys.executable), rust_dir)) if "GITHUB_ACTIONS" in os.environ: print("::endgroup::") diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index 89ad803ac3b..9ac19a2a5f2 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -15,7 +15,6 @@ #![feature(unqualified_local_imports)] #![feature(derive_coerce_pointee)] #![feature(arbitrary_self_types)] -#![feature(extract_if)] // Configure clippy and other lints #![allow( clippy::collapsible_else_if, |