Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit ecf2d1f

Browse files
committed
Auto merge of rust-lang#131635 - tgross35:rollup-df8il2t, r=tgross35
Rollup of 7 pull requests Successful merges: - rust-lang#131120 (Stabilize `const_option`) - rust-lang#131334 (Enable sanitizers for loongarch64-unknown-*) - rust-lang#131358 (force "HEAD" for non-CI and `git_upstream_merge_base` for CI environment) - rust-lang#131418 (Use throw intrinsic from stdarch in wasm libunwind) - rust-lang#131579 (Remap path prefix in the panic message of `tests/ui/meta/revision-bad.rs`) - rust-lang#131591 (add latest crash tests) - rust-lang#131626 (remove a couple of redundant String to String conversion) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ef4e825 + 39071fd commit ecf2d1f

File tree

35 files changed

+160
-55
lines changed

35 files changed

+160
-55
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ jobs:
122122
# which then uses log commands to actually set them.
123123
EXTRA_VARIABLES: ${{ toJson(matrix.env) }}
124124

125+
- name: setup upstream remote
126+
run: src/ci/scripts/setup-upstream-remote.sh
127+
125128
- name: ensure the channel matches the target branch
126129
run: src/ci/scripts/verify-channel.sh
127130

compiler/rustc_borrowck/src/diagnostics/move_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
706706
suggestions.push((
707707
pat_span,
708708
format!("consider removing the {to_remove}"),
709-
suggestion.to_string(),
709+
suggestion,
710710
));
711711
}
712712
}

compiler/rustc_codegen_llvm/src/asm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl<'ll, 'tcx> AsmBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
154154
// We prefer the latter because it matches the behavior of
155155
// Clang.
156156
if late && matches!(reg, InlineAsmRegOrRegClass::Reg(_)) {
157-
constraints.push(reg_to_llvm(reg, Some(&in_value.layout)).to_string());
157+
constraints.push(reg_to_llvm(reg, Some(&in_value.layout)));
158158
} else {
159159
constraints.push(format!("{}", op_idx[&idx]));
160160
}

compiler/rustc_middle/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#![feature(box_as_ptr)]
3838
#![feature(box_patterns)]
3939
#![feature(closure_track_caller)]
40-
#![feature(const_option)]
4140
#![feature(const_type_name)]
4241
#![feature(core_intrinsics)]
4342
#![feature(coroutines)]

compiler/rustc_middle/src/ty/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ pub fn suggest_constraining_type_params<'a>(
325325
let suggestion = if span_to_replace.is_some() {
326326
constraint.clone()
327327
} else if constraint.starts_with('<') {
328-
constraint.to_string()
328+
constraint.clone()
329329
} else if bound_list_non_empty {
330330
format!(" + {constraint}")
331331
} else {

compiler/rustc_serialize/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
test(attr(allow(unused_variables), deny(warnings)))
1111
)]
1212
#![doc(rust_logo)]
13-
#![feature(const_option)]
1413
#![feature(core_intrinsics)]
1514
#![feature(min_specialization)]
1615
#![feature(never_type)]

compiler/rustc_session/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ pub fn extra_compiler_flags() -> Option<(Vec<String>, bool)> {
137137
let content = if arg.len() == a.len() {
138138
// A space-separated option, like `-C incremental=foo` or `--crate-type rlib`
139139
match args.next() {
140-
Some(arg) => arg.to_string(),
140+
Some(arg) => arg,
141141
None => continue,
142142
}
143143
} else if arg.get(a.len()..a.len() + 1) == Some("=") {

compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_gnu.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{CodeModel, Target, TargetOptions, base};
1+
use crate::spec::{CodeModel, SanitizerSet, Target, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
@@ -18,6 +18,11 @@ pub(crate) fn target() -> Target {
1818
features: "+f,+d".into(),
1919
llvm_abiname: "lp64d".into(),
2020
max_atomic_width: Some(64),
21+
supported_sanitizers: SanitizerSet::ADDRESS
22+
| SanitizerSet::CFI
23+
| SanitizerSet::LEAK
24+
| SanitizerSet::MEMORY
25+
| SanitizerSet::THREAD,
2126
direct_access_external_data: Some(false),
2227
..base::linux_gnu::opts()
2328
},

compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{CodeModel, Target, TargetOptions, base};
1+
use crate::spec::{CodeModel, SanitizerSet, Target, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
@@ -19,6 +19,11 @@ pub(crate) fn target() -> Target {
1919
llvm_abiname: "lp64d".into(),
2020
max_atomic_width: Some(64),
2121
crt_static_default: false,
22+
supported_sanitizers: SanitizerSet::ADDRESS
23+
| SanitizerSet::CFI
24+
| SanitizerSet::LEAK
25+
| SanitizerSet::MEMORY
26+
| SanitizerSet::THREAD,
2227
..base::linux_musl::opts()
2328
},
2429
}

compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_ohos.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{Target, TargetOptions, base};
1+
use crate::spec::{SanitizerSet, Target, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
@@ -17,6 +17,11 @@ pub(crate) fn target() -> Target {
1717
features: "+f,+d".into(),
1818
llvm_abiname: "lp64d".into(),
1919
max_atomic_width: Some(64),
20+
supported_sanitizers: SanitizerSet::ADDRESS
21+
| SanitizerSet::CFI
22+
| SanitizerSet::LEAK
23+
| SanitizerSet::MEMORY
24+
| SanitizerSet::THREAD,
2025
..base::linux_ohos::opts()
2126
},
2227
}

0 commit comments

Comments
 (0)