Skip to content
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

Miri subtree update #116234

Merged
merged 20 commits into from
Sep 29, 2023
Merged

Miri subtree update #116234

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
32c2ed7
Bump ui test crate
oli-obk Jul 31, 2023
c69e0c2
Move `fail` tests that need dependencies into their own folder, so th…
oli-obk Aug 3, 2023
0d5f51c
Bump ui_test crate
oli-obk Aug 4, 2023
e706367
Allow limiting the number of threads running in parallel
oli-obk Aug 4, 2023
9f4e7c6
Bump ui_test crate
oli-obk Aug 8, 2023
5f440dd
GC the Stacked Borrows allocation history
saethlin Sep 24, 2023
1ec85a8
Document new env var
oli-obk Sep 25, 2023
71aea48
Explain single element vector
oli-obk Sep 25, 2023
b4dc4f3
Auto merge of #3008 - oli-obk:ui_test_progress_bars, r=RalfJung
bors Sep 25, 2023
ee30aaf
fix normalization in backtrace-api tests
RalfJung Sep 25, 2023
32c0afb
Auto merge of #3083 - saethlin:gc-history, r=oli-obk
bors Sep 25, 2023
e86c68a
Auto merge of #3085 - RalfJung:test-norm, r=RalfJung
bors Sep 25, 2023
fc0d833
Preparing for merge from rustc
Sep 27, 2023
b1f5c66
Merge from rustc
Sep 27, 2023
c8a44b1
clippy
RalfJung Sep 27, 2023
1a3dd7e
Auto merge of #3087 - rust-lang:rustup-2023-09-27, r=RalfJung
bors Sep 27, 2023
3b091cb
Preparing for merge from rustc
Sep 28, 2023
f2623ac
Merge from rustc
Sep 28, 2023
024279a
Auto merge of #3089 - rust-lang:rustup-2023-09-28, r=RalfJung
bors Sep 28, 2023
e0f4ab8
update lockfile
RalfJung Sep 28, 2023
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
clippy
  • Loading branch information
@RalfJung
RalfJung committed Sep 27, 2023
commit c8a44b1eaf5aed5cf8e57340f1ac56c9bad08acf
4 changes: 2 additions & 2 deletions src/tools/miri/cargo-miri/src/phases.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use rustc_version::VersionMeta;

use crate::{setup::*, util::*};

const CARGO_MIRI_HELP: &str = r#"Runs binary crates and tests in Miri
const CARGO_MIRI_HELP: &str = r"Runs binary crates and tests in Miri

Usage:
cargo miri [subcommand] [<cargo options>...] [--] [<program/test suite options>...]
Expand All @@ -31,7 +31,7 @@ Examples:
This will print the path to the generated sysroot (and nothing else) on stdout.
stderr will still contain progress information about how the build is doing.

"#;
";

fn show_help() {
println!("{CARGO_MIRI_HELP}");
Expand Down