Skip to content

Commit 003fa88

Browse files
committed
Auto merge of #117915 - matthiaskrgr:rollup-ztljqrr, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #116244 (Apply structured suggestion that allows test to work since 1.64) - #117686 (Build pre-coroutine-transform coroutine body on error) - #117834 (target_feature: make it more clear what that 'Option' means) - #117893 (Suggest dereferencing the LHS for binops such as `&T == T`) - #117911 (Fix some typos) r? `@ghost` `@rustbot` modify labels: rollup
2 parents dd430bc + 2e00c6f commit 003fa88

File tree

23 files changed

+404
-291
lines changed

23 files changed

+404
-291
lines changed

compiler/rustc_codegen_gcc/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ pub fn target_features(sess: &Session, allow_unstable: bool, target_info: &Locke
384384
.iter()
385385
.filter_map(
386386
|&(feature, gate)| {
387-
if sess.is_nightly_build() || allow_unstable || gate.is_none() { Some(feature) } else { None }
387+
if sess.is_nightly_build() || allow_unstable || gate.is_stable() { Some(feature) } else { None }
388388
},
389389
)
390390
.filter(|_feature| {

compiler/rustc_codegen_llvm/src/callee.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ pub fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'tcx>) ->
5959
// To avoid this, we set the Storage Class to "DllImport" so that
6060
// LLVM will prefix the name with `__imp_`. Ideally, we'd like the
6161
// existing logic below to set the Storage Class, but it has an
62-
// exemption for MinGW for backwards compatability.
62+
// exemption for MinGW for backwards compatibility.
6363
let llfn = cx.declare_fn(
6464
&common::i686_decorated_name(
6565
&dllimport,

compiler/rustc_codegen_llvm/src/llvm_util.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ pub fn target_features(sess: &Session, allow_unstable: bool) -> Vec<Symbol> {
293293
supported_target_features(sess)
294294
.iter()
295295
.filter_map(|&(feature, gate)| {
296-
if sess.is_nightly_build() || allow_unstable || gate.is_none() {
296+
if sess.is_nightly_build() || allow_unstable || gate.is_stable() {
297297
Some(feature)
298298
} else {
299299
None
@@ -554,7 +554,8 @@ pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<Str
554554
UnknownCTargetFeature { feature, rust_feature: PossibleFeature::None }
555555
};
556556
sess.emit_warning(unknown_feature);
557-
} else if feature_state.is_some_and(|(_name, feature_gate)| feature_gate.is_some())
557+
} else if feature_state
558+
.is_some_and(|(_name, feature_gate)| !feature_gate.is_stable())
558559
{
559560
// An unstable feature. Warn about using it.
560561
sess.emit_warning(UnstableCTargetFeature { feature });

0 commit comments

Comments
 (0)