Skip to content

Commit ad39372

Browse files
committed
Auto merge of #141707 - tgross35:rollup-aoygluy, r=tgross35
Rollup of 7 pull requests Successful merges: - #125087 (Optimize `Seek::stream_len` impl for `File`) - #133823 (Use `cfg_attr_trace` in AST with a placeholder attribute for accurate suggestion) - #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) - #141693 (Subtree update of `rust-analyzer`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6f69710 + 9cd4054 commit ad39372

File tree

139 files changed

+2064
-1332
lines changed

Some content is hidden

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

139 files changed

+2064
-1332
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_lint/messages.ftl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,8 +959,9 @@ lint_unused_doc_comment = unused doc comment
959959
.label = rustdoc does not generate documentation for macro invocations
960960
.help = to document an item produced by a macro, the macro must produce the documentation as part of its expansion
961961
962-
lint_unused_extern_crate = unused extern crate
963-
.suggestion = remove it
962+
lint_unused_extern_crate = unused `extern crate`
963+
.label = unused
964+
.suggestion = remove the unused `extern crate`
964965
965966
lint_unused_import_braces = braces around {$node} is unnecessary
966967

compiler/rustc_lint/src/early/diagnostics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ pub fn decorate_builtin_lint(
292292
BuiltinLintDiag::ByteSliceInPackedStructWithDerive { ty } => {
293293
lints::ByteSliceInPackedStructWithDerive { ty }.decorate_lint(diag);
294294
}
295-
BuiltinLintDiag::UnusedExternCrate { removal_span } => {
296-
lints::UnusedExternCrate { removal_span }.decorate_lint(diag);
295+
BuiltinLintDiag::UnusedExternCrate { span, removal_span } => {
296+
lints::UnusedExternCrate { span, removal_span }.decorate_lint(diag);
297297
}
298298
BuiltinLintDiag::ExternCrateNotIdiomatic { vis_span, ident_span } => {
299299
let suggestion_span = vis_span.between(ident_span);

compiler/rustc_lint/src/lints.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3077,7 +3077,9 @@ pub(crate) struct ByteSliceInPackedStructWithDerive {
30773077
#[derive(LintDiagnostic)]
30783078
#[diag(lint_unused_extern_crate)]
30793079
pub(crate) struct UnusedExternCrate {
3080-
#[suggestion(code = "", applicability = "machine-applicable")]
3080+
#[label]
3081+
pub span: Span,
3082+
#[suggestion(code = "", applicability = "machine-applicable", style = "verbose")]
30813083
pub removal_span: Span,
30823084
}
30833085

compiler/rustc_lint_defs/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,7 @@ pub enum BuiltinLintDiag {
736736
ty: String,
737737
},
738738
UnusedExternCrate {
739+
span: Span,
739740
removal_span: Span,
740741
},
741742
ExternCrateNotIdiomatic {

compiler/rustc_resolve/src/check_unused.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ impl<'a, 'ra, 'tcx> UnusedImportCheckVisitor<'a, 'ra, 'tcx> {
154154
extern_crate.id,
155155
span,
156156
BuiltinLintDiag::UnusedExternCrate {
157+
span: extern_crate.span,
157158
removal_span: extern_crate.span_with_attributes,
158159
},
159160
);

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,

0 commit comments

Comments
 (0)