Skip to content

Commit c16c016

Browse files
committed
Auto merge of #141710 - tgross35:rollup-ecyw183, r=tgross35
Rollup of 8 pull requests Successful merges: - #125087 (Optimize `Seek::stream_len` impl for `File`) - #138285 (Stabilize `repr128`) - #139994 (add `CStr::display`) - #141477 (Path::with_extension: show that it adds an extension where one did no…) - #141533 (clean up old rintf leftovers) - #141690 (Add `rustc_diagnostic_item` to `sys::Mutex` methods) - #141693 (Subtree update of `rust-analyzer`) - #141702 (Add eholk to compiler reviewer rotation) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6f69710 + 9d394b9 commit c16c016

File tree

113 files changed

+1810
-1262
lines changed

Some content is hidden

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

113 files changed

+1810
-1262
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());

compiler/rustc_span/src/symbol.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2074,6 +2074,9 @@ symbols! {
20742074
sym,
20752075
sync,
20762076
synthetic,
2077+
sys_mutex_lock,
2078+
sys_mutex_try_lock,
2079+
sys_mutex_unlock,
20772080
t32,
20782081
target,
20792082
target_abi,

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/core/src/intrinsics/mod.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2285,12 +2285,6 @@ pub fn round_ties_even_f16(x: f16) -> f16;
22852285
#[rustc_nounwind]
22862286
pub fn round_ties_even_f32(x: f32) -> f32;
22872287

2288-
/// Provided for compatibility with stdarch. DO NOT USE.
2289-
#[inline(always)]
2290-
pub unsafe fn rintf32(x: f32) -> f32 {
2291-
round_ties_even_f32(x)
2292-
}
2293-
22942288
/// Returns the nearest integer to an `f64`. Rounds half-way cases to the number with an even
22952289
/// least significant digit.
22962290
///
@@ -2300,12 +2294,6 @@ pub unsafe fn rintf32(x: f32) -> f32 {
23002294
#[rustc_nounwind]
23012295
pub fn round_ties_even_f64(x: f64) -> f64;
23022296

2303-
/// Provided for compatibility with stdarch. DO NOT USE.
2304-
#[inline(always)]
2305-
pub unsafe fn rintf64(x: f64) -> f64 {
2306-
round_ties_even_f64(x)
2307-
}
2308-
23092297
/// Returns the nearest integer to an `f128`. Rounds half-way cases to the number with an even
23102298
/// least significant digit.
23112299
///

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/std/src/fs.rs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,9 +1311,39 @@ impl Write for &File {
13111311
}
13121312
#[stable(feature = "rust1", since = "1.0.0")]
13131313
impl Seek for &File {
1314+
/// Seek to an offset, in bytes in a file.
1315+
///
1316+
/// See [`Seek::seek`] docs for more info.
1317+
///
1318+
/// # Platform-specific behavior
1319+
///
1320+
/// This function currently corresponds to the `lseek64` function on Unix
1321+
/// and the `SetFilePointerEx` function on Windows. Note that this [may
1322+
/// change in the future][changes].
1323+
///
1324+
/// [changes]: io#platform-specific-behavior
13141325
fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
13151326
self.inner.seek(pos)
13161327
}
1328+
1329+
/// Returns the length of this file (in bytes).
1330+
///
1331+
/// See [`Seek::stream_len`] docs for more info.
1332+
///
1333+
/// # Platform-specific behavior
1334+
///
1335+
/// This function currently corresponds to the `statx` function on Linux
1336+
/// (with fallbacks) and the `GetFileSizeEx` function on Windows. Note that
1337+
/// this [may change in the future][changes].
1338+
///
1339+
/// [changes]: io#platform-specific-behavior
1340+
fn stream_len(&mut self) -> io::Result<u64> {
1341+
if let Some(result) = self.inner.size() {
1342+
return result;
1343+
}
1344+
io::stream_len_default(self)
1345+
}
1346+
13171347
fn stream_position(&mut self) -> io::Result<u64> {
13181348
self.inner.tell()
13191349
}
@@ -1363,6 +1393,9 @@ impl Seek for File {
13631393
fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
13641394
(&*self).seek(pos)
13651395
}
1396+
fn stream_len(&mut self) -> io::Result<u64> {
1397+
(&*self).stream_len()
1398+
}
13661399
fn stream_position(&mut self) -> io::Result<u64> {
13671400
(&*self).stream_position()
13681401
}
@@ -1412,6 +1445,9 @@ impl Seek for Arc<File> {
14121445
fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
14131446
(&**self).seek(pos)
14141447
}
1448+
fn stream_len(&mut self) -> io::Result<u64> {
1449+
(&**self).stream_len()
1450+
}
14151451
fn stream_position(&mut self) -> io::Result<u64> {
14161452
(&**self).stream_position()
14171453
}

0 commit comments

Comments
 (0)