Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e69336e

Browse files
committedNov 16, 2022
Auto merge of #104492 - matthiaskrgr:rollup-3xyjynz, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #103750 (Fix some misleading target feature aliases) - #104137 (Issue error when -C link-self-contained option is used on unsupported platforms) - #104317 (cleanup and dedupe CTFE and Miri error reporting) - #104335 (Only do parser recovery on retried macro matching) - #104394 (various cleanups to try to reduce the use of spans inside method resolution) - #104459 (rustdoc: remove unused JS IIFE from main.js) - #104462 (rustdoc: remove pointless CSS `.rightside { padding-right: 2px }`) - #104466 (rustdoc: remove no-op CSS `#crate-search-div { display: inline-block }`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 63c748e + 972ad00 commit e69336e

File tree

125 files changed

+922
-735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+922
-735
lines changed
 

‎compiler/rustc_codegen_cranelift/src/constant.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub(crate) fn check_constants(fx: &mut FunctionCx<'_, '_, '_>) -> bool {
4747
if let Err(err) = fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), unevaluated, None) {
4848
all_constants_ok = false;
4949
match err {
50-
ErrorHandled::Reported(_) | ErrorHandled::Linted => {
50+
ErrorHandled::Reported(_) => {
5151
fx.tcx.sess.span_err(constant.span, "erroneous constant encountered");
5252
}
5353
ErrorHandled::TooGeneric => {

‎compiler/rustc_codegen_gcc/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,10 @@ pub fn target_features(sess: &Session, allow_unstable: bool) -> Vec<Symbol> {
315315
false
316316
}
317317
/*
318-
adx, aes, avx, avx2, avx512bf16, avx512bitalg, avx512bw, avx512cd, avx512dq, avx512er, avx512f, avx512gfni,
319-
avx512ifma, avx512pf, avx512vaes, avx512vbmi, avx512vbmi2, avx512vl, avx512vnni, avx512vp2intersect, avx512vpclmulqdq,
320-
avx512vpopcntdq, bmi1, bmi2, cmpxchg16b, ermsb, f16c, fma, fxsr, lzcnt, movbe, pclmulqdq, popcnt, rdrand, rdseed, rtm,
321-
sha, sse, sse2, sse3, sse4.1, sse4.2, sse4a, ssse3, tbm, xsave, xsavec, xsaveopt, xsaves
318+
adx, aes, avx, avx2, avx512bf16, avx512bitalg, avx512bw, avx512cd, avx512dq, avx512er, avx512f, avx512ifma,
319+
avx512pf, avx512vbmi, avx512vbmi2, avx512vl, avx512vnni, avx512vp2intersect, avx512vpopcntdq,
320+
bmi1, bmi2, cmpxchg16b, ermsb, f16c, fma, fxsr, gfni, lzcnt, movbe, pclmulqdq, popcnt, rdrand, rdseed, rtm,
321+
sha, sse, sse2, sse3, sse4.1, sse4.2, sse4a, ssse3, tbm, vaes, vpclmulqdq, xsave, xsavec, xsaveopt, xsaves
322322
*/
323323
//false
324324
})

0 commit comments

Comments
 (0)
Please sign in to comment.