Skip to content

Commit 8afd710

Browse files
committed
Auto merge of rust-lang#141717 - jhpratt:rollup-neu8nzl, r=jhpratt
Rollup of 4 pull requests Successful merges: - rust-lang#138285 (Stabilize `repr128`) - rust-lang#139994 (add `CStr::display`) - rust-lang#141571 (coretests: extend and simplify float tests) - rust-lang#141656 (CI: Add cargo tests to aarch64-apple-darwin) Failed merges: - rust-lang#141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`) - rust-lang#141636 (avoid some usages of `&mut P<T>` in AST visitors) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 38081f2 + ee3e807 commit 8afd710

File tree

38 files changed

+291
-459
lines changed

38 files changed

+291
-459
lines changed

compiler/rustc_error_codes/src/error_codes/E0658.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ An unstable feature was used.
33
Erroneous code example:
44

55
```compile_fail,E0658
6-
#[repr(u128)] // error: use of unstable library feature 'repr128'
7-
enum Foo {
8-
Bar(u64),
9-
}
6+
use std::intrinsics; // error: use of unstable library feature `core_intrinsics`
107
```
118

129
If you're using a stable or a beta version of rustc, you won't be able to use
@@ -17,12 +14,9 @@ If you're using a nightly version of rustc, just add the corresponding feature
1714
to be able to use it:
1815

1916
```
20-
#![feature(repr128)]
17+
#![feature(core_intrinsics)]
2118
22-
#[repr(u128)] // ok!
23-
enum Foo {
24-
Bar(u64),
25-
}
19+
use std::intrinsics; // ok!
2620
```
2721

2822
[rustup]: https://rust-lang.github.io/rustup/concepts/channels.html

compiler/rustc_feature/src/accepted.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,8 @@ declare_features! (
360360
(accepted, relaxed_adts, "1.19.0", Some(35626)),
361361
/// Lessens the requirements for structs to implement `Unsize`.
362362
(accepted, relaxed_struct_unsize, "1.58.0", Some(81793)),
363+
/// Allows the `#[repr(i128)]` attribute for enums.
364+
(accepted, repr128, "CURRENT_RUSTC_VERSION", Some(56071)),
363365
/// Allows `repr(align(16))` struct attribute (RFC 1358).
364366
(accepted, repr_align, "1.25.0", Some(33626)),
365367
/// Allows using `#[repr(align(X))]` on enums with equivalent semantics

compiler/rustc_feature/src/unstable.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,6 @@ declare_features! (
621621
(incomplete, ref_pat_eat_one_layer_2024_structural, "1.81.0", Some(123076)),
622622
/// Allows using the `#[register_tool]` attribute.
623623
(unstable, register_tool, "1.41.0", Some(66079)),
624-
/// Allows the `#[repr(i128)]` attribute for enums.
625-
(incomplete, repr128, "1.16.0", Some(56071)),
626624
/// Allows `repr(simd)` and importing the various simd intrinsics.
627625
(unstable, repr_simd, "1.4.0", Some(27731)),
628626
/// Allows bounding the return type of AFIT/RPITIT.

compiler/rustc_hir_analysis/src/check/check.rs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use rustc_middle::middle::resolve_bound_vars::ResolvedArg;
1818
use rustc_middle::middle::stability::EvalResult;
1919
use rustc_middle::ty::error::TypeErrorToStringExt;
2020
use rustc_middle::ty::layout::{LayoutError, MAX_SIMD_LANES};
21-
use rustc_middle::ty::util::{Discr, IntTypeExt};
21+
use rustc_middle::ty::util::Discr;
2222
use rustc_middle::ty::{
2323
AdtDef, BottomUpFolder, GenericArgKind, RegionKind, TypeFoldable, TypeSuperVisitable,
2424
TypeVisitable, TypeVisitableExt, fold_regions,
@@ -1385,19 +1385,6 @@ fn check_enum(tcx: TyCtxt<'_>, def_id: LocalDefId) {
13851385
);
13861386
}
13871387

1388-
let repr_type_ty = def.repr().discr_type().to_ty(tcx);
1389-
if repr_type_ty == tcx.types.i128 || repr_type_ty == tcx.types.u128 {
1390-
if !tcx.features().repr128() {
1391-
feature_err(
1392-
&tcx.sess,
1393-
sym::repr128,
1394-
tcx.def_span(def_id),
1395-
"repr with 128-bit type is unstable",
1396-
)
1397-
.emit();
1398-
}
1399-
}
1400-
14011388
for v in def.variants() {
14021389
if let ty::VariantDiscr::Explicit(discr_def_id) = v.discr {
14031390
tcx.ensure_ok().typeck(discr_def_id.expect_local());

library/core/src/ffi/c_str.rs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,30 @@ impl CStr {
632632
// instead of doing it afterwards.
633633
str::from_utf8(self.to_bytes())
634634
}
635+
636+
/// Returns an object that implements [`Display`] for safely printing a [`CStr`] that may
637+
/// contain non-Unicode data.
638+
///
639+
/// Behaves as if `self` were first lossily converted to a `str`, with invalid UTF-8 presented
640+
/// as the Unicode replacement character: �.
641+
///
642+
/// [`Display`]: fmt::Display
643+
///
644+
/// # Examples
645+
///
646+
/// ```
647+
/// #![feature(cstr_display)]
648+
///
649+
/// let cstr = c"Hello, world!";
650+
/// println!("{}", cstr.display());
651+
/// ```
652+
#[unstable(feature = "cstr_display", issue = "139984")]
653+
#[must_use = "this does not display the `CStr`; \
654+
it returns an object that can be displayed"]
655+
#[inline]
656+
pub fn display(&self) -> impl fmt::Display {
657+
crate::bstr::ByteStr::from_bytes(self.to_bytes())
658+
}
635659
}
636660

637661
// `.to_bytes()` representations are compared instead of the inner `[c_char]`s,

library/coretests/tests/ffi/cstr.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,9 @@ fn debug() {
1919
let s = c"abc\x01\x02\n\xE2\x80\xA6\xFF";
2020
assert_eq!(format!("{s:?}"), r#""abc\x01\x02\n\xe2\x80\xa6\xff""#);
2121
}
22+
23+
#[test]
24+
fn display() {
25+
let s = c"\xf0\x28\x8c\xbc";
26+
assert_eq!(format!("{}", s.display()), "�(��");
27+
}

library/coretests/tests/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#![feature(core_io_borrowed_buf)]
2424
#![feature(core_private_bignum)]
2525
#![feature(core_private_diy_float)]
26+
#![feature(cstr_display)]
2627
#![feature(dec2flt)]
2728
#![feature(duration_constants)]
2829
#![feature(duration_constructors)]

library/coretests/tests/num/mod.rs

Lines changed: 114 additions & 135 deletions
Large diffs are not rendered by default.

src/ci/github-actions/jobs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,9 @@ auto:
469469

470470
- name: aarch64-apple
471471
env:
472-
SCRIPT: ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
472+
SCRIPT: >
473+
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin &&
474+
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin src/tools/cargo
473475
RUST_CONFIGURE_ARGS: >-
474476
--enable-sanitizers
475477
--enable-profiler

src/doc/unstable-book/src/language-features/repr128.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/tools/clippy/tests/ui/auxiliary/proc_macro_attr.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#![feature(repr128, proc_macro_hygiene, proc_macro_quote, box_patterns)]
2-
#![allow(incomplete_features)]
1+
#![feature(proc_macro_hygiene, proc_macro_quote, box_patterns)]
32
#![allow(clippy::useless_conversion, clippy::uninlined_format_args)]
43

54
extern crate proc_macro;

src/tools/clippy/tests/ui/auxiliary/proc_macro_derive.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#![feature(repr128, proc_macro_quote, proc_macro_span)]
2-
#![allow(incomplete_features)]
1+
#![feature(proc_macro_quote, proc_macro_span)]
32
#![allow(clippy::field_reassign_with_default)]
43
#![allow(clippy::eq_op)]
54
#![allow(clippy::literal_string_with_formatting_args)]

src/tools/clippy/tests/ui/cast.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
//@no-rustfix: only some diagnostics have suggestions
22

3-
#![feature(repr128)]
4-
#![allow(incomplete_features)]
53
#![warn(
64
clippy::cast_precision_loss,
75
clippy::cast_possible_truncation,

0 commit comments

Comments
 (0)