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.

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

Automatic sync from rustc #3087

Merged
merged 27 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
44d1839
Auto merge of #115794 - cjgillot:aggregate-no-box, r=davidtwco
bors Sep 24, 2023
730b174
Auto merge of #116075 - Colonial-Dev:issue-116063-fix, r=Mark-Simulacrum
bors Sep 24, 2023
9b399be
Auto merge of #105861 - Ayush1325:uefi-std-minimial, r=workingjubilee
bors Sep 24, 2023
759a0d0
Auto merge of #116076 - chriswailes:android-riscv-extension-update, r…
bors Sep 24, 2023
a539556
Auto merge of #116069 - compiler-errors:debug-tuple, r=Nilstrieb
bors Sep 24, 2023
2bf4030
Auto merge of #116120 - GuillaumeGomez:regression-102467, r=compiler-…
bors Sep 24, 2023
c520e15
Auto merge of #116057 - RalfJung:io-safety, r=Mark-Simulacrum
bors Sep 25, 2023
7ce46fc
Auto merge of #116074 - fzs111:clarify-pin-docs, r=Mark-Simulacrum
bors Sep 25, 2023
dc73c54
Auto merge of #116078 - eduardosm:closure-inherit-target-feature, r=M…
bors Sep 25, 2023
c7026a0
Auto merge of #116138 - RalfJung:miri, r=RalfJung
bors Sep 25, 2023
0ed2d1f
Auto merge of #116029 - chenx97:mipsr6-update-crates, r=Mark-Simulacrum
bors Sep 25, 2023
e9e9328
Auto merge of #116147 - compiler-errors:jq, r=dtolnay
bors Sep 25, 2023
6966be1
Auto merge of #113396 - lenko-d:dont_ICE_when_no_bound_vars_for_lifet…
bors Sep 25, 2023
c1d9224
Auto merge of #116070 - eduardosm:IoSlice-advance_slices-checked_add,…
bors Sep 25, 2023
8739609
Auto merge of #116084 - fmease:rustdoc-fix-x-crate-async-fn, r=Guilla…
bors Sep 25, 2023
977b939
Auto merge of #116072 - compiler-errors:rpitit-implied-bounds, r=alie…
bors Sep 26, 2023
50ee0d7
Auto merge of #116124 - WaffleLapkin:fix-proc-macro-literal-to-string…
bors Sep 26, 2023
fa4a037
Auto merge of #116125 - RalfJung:const-param-ty-eq, r=compiler-errors
bors Sep 26, 2023
de1f7a8
Auto merge of #116139 - flip1995:clippyup, r=Manishearth
bors Sep 26, 2023
4c4a2bf
Auto merge of #116109 - Zoxc:no-dep-graph-thread, r=oli-obk
bors Sep 26, 2023
ba5e2df
Auto merge of #115893 - RalfJung:match-require-partial-eq, r=oli-obk
bors Sep 26, 2023
8465be5
Auto merge of #116154 - cjgillot:retain-cfg, r=oli-obk
bors Sep 26, 2023
1ee35bc
Auto merge of #116102 - cjgillot:indirect-scalar, r=oli-obk
bors Sep 26, 2023
0729ecb
Auto merge of #116156 - oli-obk:opaque_place_unwrap, r=compiler-errors
bors Sep 27, 2023
d9a8468
Preparing for merge from rustc
Sep 27, 2023
82cfe26
Merge from rustc
Sep 27, 2023
b77aad7
clippy
RalfJung Sep 27, 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
4 changes: 2 additions & 2 deletions cargo-miri/src/phases.rs
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
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
42ca6e4e5760a548a6fa858482de6d237f6fb3b8
d206f2c0857eb879877f27508139dd62a40294c3