Skip to content

Commit 81bfb36

Browse files
borsbors
committed
Auto merge of #148642 - GuillaumeGomez:rollup-qdothm9, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #145656 (Stabilize s390x `vector` target feature and `is_s390x_feature_detected!` macro) - #148204 (Modify contributor email entries in .mailmap) - #148556 (Fix suggestion for returning async closures) - #148585 ([rustdoc] Replace `print` methods with functions to improve code readability) - #148608 (Add test for --test-builder success path) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9606412 + 1f80593 commit 81bfb36

35 files changed

+992
-737
lines changed

‎.mailmap‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Aaron Todd <[email protected]>
99
Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
1010
Abhijeet Bhagat <[email protected]>
1111
Abroskin Alexander <[email protected]>
12-
Adolfo Ochagavía <[email protected]>
12+
Adolfo Ochagavía <[email protected]> <[email protected]>
1313
Adrian Heine né Lang <[email protected]>
1414
Adrien Tétar <[email protected]>
1515
Ahmed Charles <[email protected]> <[email protected]>
@@ -36,6 +36,7 @@ Amanda Stjerna <[email protected]> <[email protected]>
3636
Amanda Stjerna <[email protected]> <[email protected]>
3737
Amanieu d'Antras <[email protected]> <[email protected]>
3838
Amos Onn <[email protected]>
39+
Amos Wenger <[email protected]> <[email protected]>
3940
Ana-Maria Mihalache <[email protected]>
4041
Anatoly Ikorsky <[email protected]>
4142
Andre Bogus <[email protected]>
@@ -276,7 +277,8 @@ Irina Popa <[email protected]>
276277
Ivan Ivaschenko <[email protected]>
277278
ivan tkachenko <[email protected]>
278279
J. J. Weber <[email protected]>
279-
Jack Huey <[email protected]> <[email protected]>
280+
Jack Huey <[email protected]> <[email protected]>
281+
Jack Huey <[email protected]> <[email protected]>
280282
Jacob <[email protected]>
281283
Jacob Hoffman-Andrews <[email protected]> <[email protected]>
282284
Jacob Greenfield <[email protected]>
@@ -292,6 +294,8 @@ Jakub Adam Wieczorek <[email protected]>
292294
Jakub Adam Wieczorek <[email protected]> <[email protected]>
293295
Jakub Adam Wieczorek <[email protected]> <[email protected]>
294296
Jakub Adam Wieczorek <[email protected]> <[email protected]>
297+
Jakub Adam Wieczorek <[email protected]> <[email protected]>
298+
Jakub Adam Wieczorek <[email protected]> <[email protected]>
295299
Jakub Beránek <[email protected]> <[email protected]>
296300
James [Undefined] <[email protected]>
297301
James Deng <[email protected]> <[email protected]>
@@ -303,6 +307,7 @@ Jamie Hill-Daniel <[email protected]> <[email protected]>
303307
Jana Dönszelmann <[email protected]>
304308
Jana Dönszelmann <[email protected]> <[email protected]>
305309
Jana Dönszelmann <[email protected]> <[email protected]>
310+
Jane Lusby <[email protected]> <[email protected]>
306311
Jan-Erik Rediger <[email protected]> <[email protected]>
307312
Jaro Fietz <[email protected]>
308313
Jason Fager <[email protected]>
@@ -313,6 +318,7 @@ Jason Toffaletti <[email protected]> Jason Toffaletti <[email protected]>
313318
Jauhien Piatlicki <[email protected]> Jauhien Piatlicki <[email protected]>
314319
Jay True <[email protected]>
315320
Jeremy Letang <[email protected]>
321+
Jeremy Soller <[email protected]> <[email protected]>
316322
Jeremy Sorensen <[email protected]>
317323
Jeremy Stucki <[email protected]> <[email protected]>
318324
Jeremy Stucki <[email protected]> <[email protected]>
@@ -336,6 +342,7 @@ John Kåre Alsaker <[email protected]>
336342
John Kåre Alsaker <[email protected]> <[email protected]>
337343
John Talling <[email protected]>
338344
John Van Enk <[email protected]>
345+
Jon Gjengset <[email protected]> <[email protected]>
339346
Jonas Tepe <[email protected]>
340347
Jonathan Bailey <[email protected]> <[email protected]>
341348
Jonathan Chan Kwan Yin <[email protected]>
@@ -424,7 +431,7 @@ Malo Jaffré <[email protected]>
424431
Manish Goregaokar <[email protected]>
425432
Mara Bos <[email protected]>
426433
Marcell Pardavi <[email protected]>
427-
Marco Ieni <[email protected]>
434+
Marco Ieni <[email protected]> <[email protected]>
428435
Marcus Klaas de Vries <[email protected]>
429436
Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
430437
Marijn Schouten <[email protected]> <[email protected]>
@@ -531,6 +538,7 @@ Oliver Scherer <[email protected]> <[email protected]>
531538
Oliver Scherer <[email protected]> <[email protected]>
532539
Oliver Scherer <[email protected]> <[email protected]>
533540
Oliver Scherer <[email protected]>
541+
Onur Özkan <[email protected]> <[email protected]>
534542
Onur Özkan <[email protected]> <[email protected]>
535543
Onur Özkan <[email protected]>
536544
Ömer Sinan Ağacan <[email protected]>
@@ -591,6 +599,7 @@ Rusty Blitzerr <[email protected]>
591599
RustyYato <[email protected]>
592600
Ruud van Asseldonk <[email protected]> Ruud van Asseldonk <[email protected]>
593601
Ryan Leung <[email protected]>
602+
Ryan Levick <[email protected]> <[email protected]>
594603
Ryan Scheel <[email protected]>
595604
Ryan Sullivant <[email protected]>
596605
Ryan Wiedemann <[email protected]>
@@ -686,6 +695,8 @@ Weihang Lo <[email protected]>
686695
Weihang Lo <[email protected]> <[email protected]>
687696
Wesley Wiser <[email protected]> <[email protected]>
688697
whitequark <[email protected]>
698+
Will Crichton <[email protected]> <[email protected]>
699+
Will Crichton <[email protected]> <[email protected]>
689700
William Ting <[email protected]> <[email protected]>
690701
Wim Looman <[email protected]> <[email protected]>
691702
Wim Looman <[email protected]> <[email protected]>
@@ -695,6 +706,8 @@ Xinye Tao <[email protected]>
695706
Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
696707
Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
697708
York Xiang <[email protected]>
709+
Yoshua Wuyts <[email protected]> <[email protected]>
710+
Yoshua Wuyts <[email protected]> <[email protected]>
698711
Yotam Ofek <[email protected]> <[email protected]>
699712
Youngsoo Son <[email protected]> <[email protected]>
700713
Youngsuk Kim <[email protected]>

‎compiler/rustc_feature/src/accepted.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ declare_features! (
387387
(accepted, return_position_impl_trait_in_trait, "1.75.0", Some(91611)),
388388
/// Allows code like `let x: &'static u32 = &42` to work (RFC 1414).
389389
(accepted, rvalue_static_promotion, "1.21.0", Some(38865)),
390+
/// Allows use of the `vector` and related s390x target features.
391+
(accepted, s390x_target_feature_vector, "CURRENT_RUSTC_VERSION", Some(145649)),
390392
/// Allows `Self` in type definitions (RFC 2300).
391393
(accepted, self_in_typedefs, "1.32.0", Some(49303)),
392394
/// Allows `Self` struct constructor (RFC 2302).

‎compiler/rustc_hir_analysis/src/collect.rs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,21 @@ pub fn suggest_impl_trait<'tcx>(
12631263
infcx.tcx.lang_items().future_output(),
12641264
format_as_assoc,
12651265
),
1266+
(
1267+
infcx.tcx.lang_items().async_fn_trait(),
1268+
infcx.tcx.lang_items().async_fn_once_output(),
1269+
format_as_parenthesized,
1270+
),
1271+
(
1272+
infcx.tcx.lang_items().async_fn_mut_trait(),
1273+
infcx.tcx.lang_items().async_fn_once_output(),
1274+
format_as_parenthesized,
1275+
),
1276+
(
1277+
infcx.tcx.lang_items().async_fn_once_trait(),
1278+
infcx.tcx.lang_items().async_fn_once_output(),
1279+
format_as_parenthesized,
1280+
),
12661281
(
12671282
infcx.tcx.lang_items().fn_trait(),
12681283
infcx.tcx.lang_items().fn_once_output(),

‎compiler/rustc_span/src/symbol.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,6 +2000,7 @@ symbols! {
20002000
s,
20012001
s390x,
20022002
s390x_target_feature,
2003+
s390x_target_feature_vector,
20032004
safety,
20042005
sanitize,
20052006
sanitizer_cfi_generalize_pointers,

‎compiler/rustc_target/src/target_features.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -844,20 +844,20 @@ const IBMZ_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
844844
("message-security-assist-extension8", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3"]),
845845
("message-security-assist-extension9", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3", "message-security-assist-extension4"]),
846846
("message-security-assist-extension12", Unstable(sym::s390x_target_feature), &[]),
847-
("miscellaneous-extensions-2", Unstable(sym::s390x_target_feature), &[]),
848-
("miscellaneous-extensions-3", Unstable(sym::s390x_target_feature), &[]),
849-
("miscellaneous-extensions-4", Unstable(sym::s390x_target_feature), &[]),
850-
("nnp-assist", Unstable(sym::s390x_target_feature), &["vector"]),
847+
("miscellaneous-extensions-2", Stable, &[]),
848+
("miscellaneous-extensions-3", Stable, &[]),
849+
("miscellaneous-extensions-4", Stable, &[]),
850+
("nnp-assist", Stable, &["vector"]),
851851
("soft-float", Forbidden { reason: "currently unsupported ABI-configuration feature" }, &[]),
852852
("transactional-execution", Unstable(sym::s390x_target_feature), &[]),
853-
("vector", Unstable(sym::s390x_target_feature), &[]),
854-
("vector-enhancements-1", Unstable(sym::s390x_target_feature), &["vector"]),
855-
("vector-enhancements-2", Unstable(sym::s390x_target_feature), &["vector-enhancements-1"]),
856-
("vector-enhancements-3", Unstable(sym::s390x_target_feature), &["vector-enhancements-2"]),
857-
("vector-packed-decimal", Unstable(sym::s390x_target_feature), &["vector"]),
858-
("vector-packed-decimal-enhancement", Unstable(sym::s390x_target_feature), &["vector-packed-decimal"]),
859-
("vector-packed-decimal-enhancement-2", Unstable(sym::s390x_target_feature), &["vector-packed-decimal-enhancement"]),
860-
("vector-packed-decimal-enhancement-3", Unstable(sym::s390x_target_feature), &["vector-packed-decimal-enhancement-2"]),
853+
("vector", Stable, &[]),
854+
("vector-enhancements-1", Stable, &["vector"]),
855+
("vector-enhancements-2", Stable, &["vector-enhancements-1"]),
856+
("vector-enhancements-3", Stable, &["vector-enhancements-2"]),
857+
("vector-packed-decimal", Stable, &["vector"]),
858+
("vector-packed-decimal-enhancement", Stable, &["vector-packed-decimal"]),
859+
("vector-packed-decimal-enhancement-2", Stable, &["vector-packed-decimal-enhancement"]),
860+
("vector-packed-decimal-enhancement-3", Stable, &["vector-packed-decimal-enhancement-2"]),
861861
// tidy-alphabetical-end
862862
];
863863

‎library/std/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ pub mod arch {
672672
pub use std_detect::is_loongarch_feature_detected;
673673
#[unstable(feature = "is_riscv_feature_detected", issue = "111192")]
674674
pub use std_detect::is_riscv_feature_detected;
675-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
675+
#[stable(feature = "stdarch_s390x_feature_detection", since = "CURRENT_RUSTC_VERSION")]
676676
pub use std_detect::is_s390x_feature_detected;
677677
#[stable(feature = "simd_x86", since = "1.27.0")]
678678
pub use std_detect::is_x86_feature_detected;

‎library/std/tests/run-time-detect.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
all(target_arch = "aarch64", any(target_os = "linux", target_os = "android")),
99
feature(stdarch_aarch64_feature_detection)
1010
)]
11-
#![cfg_attr(
12-
all(target_arch = "s390x", target_os = "linux"),
13-
feature(stdarch_s390x_feature_detection)
14-
)]
1511
#![cfg_attr(
1612
all(target_arch = "powerpc", target_os = "linux"),
1713
feature(stdarch_powerpc_feature_detection)

‎library/std_detect/src/detect/arch/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ cfg_select! {
6060
pub use loongarch::*;
6161
}
6262
target_arch = "s390x" => {
63-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
63+
#[stable(feature = "stdarch_s390x_feature_detection", since = "CURRENT_RUSTC_VERSION")]
6464
pub use s390x::*;
6565
}
6666
_ => {

0 commit comments

Comments
 (0)