Skip to content

Commit 048e716

Browse files
borsbors
committed
Auto merge of rust-lang#129979 - matthiaskrgr:rollup-ig5r2wg, r=matthiaskrgr
Rollup of 12 pull requests Successful merges: - rust-lang#128919 (Add an internal lint that warns when accessing untracked data) - rust-lang#129471 ([rustdoc] Sort impl associated items by kinds and then by appearance) - rust-lang#129653 (clarify that addr_of creates read-only pointers) - rust-lang#129775 (bootstrap: Try to track down why `initial_libdir` sometimes fails) - rust-lang#129939 (explain why Rvalue::Len still exists) - rust-lang#129940 (s390x: Fix a regression related to backchain feature) - rust-lang#129942 (copy rustc rustlib artifacts from ci-rustc) - rust-lang#129943 (use the bootstrapped compiler for `test-float-parse` test) - rust-lang#129944 (Add compat note for trait solver change) - rust-lang#129947 (Add digit separators in `Duration` examples) - rust-lang#129955 (Temporarily remove fmease from the review rotation) - rust-lang#129957 (forward linker option to lint-docs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 009e738 + 919f4cc commit 048e716

File tree

29 files changed

+380
-96
lines changed

29 files changed

+380
-96
lines changed

Diff for: ‎RELEASES.md

+3
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ Compatibility Notes
100100
The reason is that these types have different roles: `std::panic::PanicHookInfo` is the argument to the [panic hook](https://doc.rust-lang.org/stable/std/panic/fn.set_hook.html) in std context (where panics can have an arbitrary payload), while `core::panic::PanicInfo` is the argument to the [`#[panic_handler]`](https://doc.rust-lang.org/nomicon/panic-handler.html) in no_std context (where panics always carry a formatted *message*). Separating these types allows us to add more useful methods to these types, such as `std::panic::PanicHookInfo::payload_as_str()` and `core::panic::PanicInfo::message()`.
101101

102102
* The new sort implementations may panic if a type's implementation of [`Ord`](https://doc.rust-lang.org/std/cmp/trait.Ord.html) (or the given comparison function) does not implement a [total order](https://en.wikipedia.org/wiki/Total_order) as the trait requires. `Ord`'s supertraits (`PartialOrd`, `Eq`, and `PartialEq`) must also be consistent. The previous implementations would not "notice" any problem, but the new implementations have a good chance of detecting inconsistencies, throwing a panic rather than returning knowingly unsorted data.
103+
* [In very rare cases, a change in the internal evaluation order of the trait
104+
solver may result in new fatal overflow errors.](https://github.com/rust-lang/rust/pull/126128)
105+
103106

104107
<a id="1.81.0-Internal-Changes"></a>
105108

Diff for: ‎compiler/rustc_codegen_llvm/src/llvm_util.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,7 @@ pub fn target_features(sess: &Session, allow_unstable: bool) -> Vec<Symbol> {
353353
None
354354
}
355355
})
356-
.filter(|feature| {
357-
RUSTC_SPECIAL_FEATURES.contains(feature) || features.contains(&Symbol::intern(feature))
358-
})
356+
.filter(|feature| features.contains(&Symbol::intern(feature)))
359357
.map(|feature| Symbol::intern(feature))
360358
.collect()
361359
}

Diff for: ‎compiler/rustc_data_structures/src/steal.rs

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ impl<T> Steal<T> {
5757
///
5858
/// This should not be used within rustc as it leaks information not tracked
5959
/// by the query system, breaking incremental compilation.
60+
#[cfg_attr(not(bootstrap), rustc_lint_untracked_query_information)]
6061
pub fn is_stolen(&self) -> bool {
6162
self.value.borrow().is_none()
6263
}

Diff for: ‎compiler/rustc_feature/src/builtin_attrs.rs

+6
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,12 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
793793
rustc_lint_query_instability, Normal, template!(Word),
794794
WarnFollowing, EncodeCrossCrate::Yes, INTERNAL_UNSTABLE
795795
),
796+
// Used by the `rustc::untracked_query_information` lint to warn methods which
797+
// might not be stable during incremental compilation.
798+
rustc_attr!(
799+
rustc_lint_untracked_query_information, Normal, template!(Word),
800+
WarnFollowing, EncodeCrossCrate::Yes, INTERNAL_UNSTABLE
801+
),
796802
// Used by the `rustc::diagnostic_outside_of_impl` lints to assist in changes to diagnostic
797803
// APIs. Any function with this attribute will be checked by that lint.
798804
rustc_attr!(

Diff for: ‎compiler/rustc_lint/messages.ftl

+3
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,9 @@ lint_ptr_null_checks_ref = references are not nullable, so checking them for nul
699699
lint_query_instability = using `{$query}` can result in unstable query results
700700
.note = if you believe this case to be fine, allow this lint and add a comment explaining your rationale
701701
702+
lint_query_untracked = `{$method}` accesses information that is not tracked by the query system
703+
.note = if you believe this case to be fine, allow this lint and add a comment explaining your rationale
704+
702705
lint_range_endpoint_out_of_range = range endpoint is out of range for `{$ty}`
703706
704707
lint_range_use_inclusive_range = use an inclusive range instead

Diff for: ‎compiler/rustc_lint/src/internal.rs

+21-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use tracing::debug;
1717

1818
use crate::lints::{
1919
BadOptAccessDiag, DefaultHashTypesDiag, DiagOutOfImpl, LintPassByHand, NonExistentDocKeyword,
20-
NonGlobImportTypeIrInherent, QueryInstability, SpanUseEqCtxtDiag, TyQualified, TykindDiag,
21-
TykindKind, TypeIrInherentUsage, UntranslatableDiag,
20+
NonGlobImportTypeIrInherent, QueryInstability, QueryUntracked, SpanUseEqCtxtDiag, TyQualified,
21+
TykindDiag, TykindKind, TypeIrInherentUsage, UntranslatableDiag,
2222
};
2323
use crate::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext};
2424

@@ -88,7 +88,18 @@ declare_tool_lint! {
8888
report_in_external_macro: true
8989
}
9090

91-
declare_lint_pass!(QueryStability => [POTENTIAL_QUERY_INSTABILITY]);
91+
declare_tool_lint! {
92+
/// The `untracked_query_information` lint detects use of methods which leak information not
93+
/// tracked by the query system, such as whether a `Steal<T>` value has already been stolen. In
94+
/// order not to break incremental compilation, such methods must be used very carefully or not
95+
/// at all.
96+
pub rustc::UNTRACKED_QUERY_INFORMATION,
97+
Allow,
98+
"require explicit opt-in when accessing information not tracked by the query system",
99+
report_in_external_macro: true
100+
}
101+
102+
declare_lint_pass!(QueryStability => [POTENTIAL_QUERY_INSTABILITY, UNTRACKED_QUERY_INFORMATION]);
92103

93104
impl LateLintPass<'_> for QueryStability {
94105
fn check_expr(&mut self, cx: &LateContext<'_>, expr: &Expr<'_>) {
@@ -102,6 +113,13 @@ impl LateLintPass<'_> for QueryStability {
102113
QueryInstability { query: cx.tcx.item_name(def_id) },
103114
);
104115
}
116+
if cx.tcx.has_attr(def_id, sym::rustc_lint_untracked_query_information) {
117+
cx.emit_span_lint(
118+
UNTRACKED_QUERY_INFORMATION,
119+
span,
120+
QueryUntracked { method: cx.tcx.item_name(def_id) },
121+
);
122+
}
105123
}
106124
}
107125
}

Diff for: ‎compiler/rustc_lint/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@ fn register_internals(store: &mut LintStore) {
609609
vec![
610610
LintId::of(DEFAULT_HASH_TYPES),
611611
LintId::of(POTENTIAL_QUERY_INSTABILITY),
612+
LintId::of(UNTRACKED_QUERY_INFORMATION),
612613
LintId::of(USAGE_OF_TY_TYKIND),
613614
LintId::of(PASS_BY_VALUE),
614615
LintId::of(LINT_PASS_IMPL_WITHOUT_MACRO),

Diff for: ‎compiler/rustc_lint/src/lints.rs

+7
Original file line numberDiff line numberDiff line change
@@ -894,6 +894,13 @@ pub(crate) struct QueryInstability {
894894
pub query: Symbol,
895895
}
896896

897+
#[derive(LintDiagnostic)]
898+
#[diag(lint_query_untracked)]
899+
#[note]
900+
pub(crate) struct QueryUntracked {
901+
pub method: Symbol,
902+
}
903+
897904
#[derive(LintDiagnostic)]
898905
#[diag(lint_span_use_eq_ctxt)]
899906
pub(crate) struct SpanUseEqCtxtDiag;

Diff for: ‎compiler/rustc_middle/src/mir/syntax.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,9 @@ pub enum Rvalue<'tcx> {
13071307
/// If the type of the place is an array, this is the array length. For slices (`[T]`, not
13081308
/// `&[T]`) this accesses the place's metadata to determine the length. This rvalue is
13091309
/// ill-formed for places of other types.
1310+
///
1311+
/// This cannot be a `UnOp(PtrMetadata, _)` because that expects a value, and we only
1312+
/// have a place, and `UnOp(PtrMetadata, RawPtr(place))` is not a thing.
13101313
Len(Place<'tcx>),
13111314

13121315
/// Performs essentially all of the casts that can be performed via `as`.

Diff for: ‎compiler/rustc_passes/src/check_attr.rs

+8-32
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
125125
[sym::inline, ..] => self.check_inline(hir_id, attr, span, target),
126126
[sym::coverage, ..] => self.check_coverage(attr, span, target),
127127
[sym::optimize, ..] => self.check_optimize(hir_id, attr, target),
128-
[sym::no_sanitize, ..] => self.check_no_sanitize(hir_id, attr, span, target),
128+
[sym::no_sanitize, ..] => {
129+
self.check_applied_to_fn_or_method(hir_id, attr, span, target)
130+
}
129131
[sym::non_exhaustive, ..] => self.check_non_exhaustive(hir_id, attr, span, target),
130132
[sym::marker, ..] => self.check_marker(hir_id, attr, span, target),
131133
[sym::target_feature, ..] => {
@@ -166,10 +168,13 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
166168
self.check_rustc_legacy_const_generics(hir_id, attr, span, target, item)
167169
}
168170
[sym::rustc_lint_query_instability, ..] => {
169-
self.check_rustc_lint_query_instability(hir_id, attr, span, target)
171+
self.check_applied_to_fn_or_method(hir_id, attr, span, target)
172+
}
173+
[sym::rustc_lint_untracked_query_information, ..] => {
174+
self.check_applied_to_fn_or_method(hir_id, attr, span, target)
170175
}
171176
[sym::rustc_lint_diagnostics, ..] => {
172-
self.check_rustc_lint_diagnostics(hir_id, attr, span, target)
177+
self.check_applied_to_fn_or_method(hir_id, attr, span, target)
173178
}
174179
[sym::rustc_lint_opt_ty, ..] => self.check_rustc_lint_opt_ty(attr, span, target),
175180
[sym::rustc_lint_opt_deny_field_access, ..] => {
@@ -452,11 +457,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
452457
}
453458
}
454459

455-
/// Checks that `#[no_sanitize(..)]` is applied to a function or method.
456-
fn check_no_sanitize(&self, hir_id: HirId, attr: &Attribute, span: Span, target: Target) {
457-
self.check_applied_to_fn_or_method(hir_id, attr, span, target)
458-
}
459-
460460
fn check_generic_attr(
461461
&self,
462462
hir_id: HirId,
@@ -1635,30 +1635,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
16351635
}
16361636
}
16371637

1638-
/// Checks that the `#[rustc_lint_query_instability]` attribute is only applied to a function
1639-
/// or method.
1640-
fn check_rustc_lint_query_instability(
1641-
&self,
1642-
hir_id: HirId,
1643-
attr: &Attribute,
1644-
span: Span,
1645-
target: Target,
1646-
) {
1647-
self.check_applied_to_fn_or_method(hir_id, attr, span, target)
1648-
}
1649-
1650-
/// Checks that the `#[rustc_lint_diagnostics]` attribute is only applied to a function or
1651-
/// method.
1652-
fn check_rustc_lint_diagnostics(
1653-
&self,
1654-
hir_id: HirId,
1655-
attr: &Attribute,
1656-
span: Span,
1657-
target: Target,
1658-
) {
1659-
self.check_applied_to_fn_or_method(hir_id, attr, span, target)
1660-
}
1661-
16621638
/// Checks that the `#[rustc_lint_opt_ty]` attribute is only applied to a struct.
16631639
fn check_rustc_lint_opt_ty(&self, attr: &Attribute, span: Span, target: Target) {
16641640
match target {

Diff for: ‎compiler/rustc_span/src/symbol.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1653,6 +1653,7 @@ symbols! {
16531653
rustc_lint_opt_deny_field_access,
16541654
rustc_lint_opt_ty,
16551655
rustc_lint_query_instability,
1656+
rustc_lint_untracked_query_information,
16561657
rustc_macro_transparency,
16571658
rustc_main,
16581659
rustc_mir,

Diff for: ‎library/core/src/ptr/mod.rs

+8
Original file line numberDiff line numberDiff line change
@@ -2277,6 +2277,14 @@ impl<F: FnPtr> fmt::Debug for F {
22772277
/// `addr_of!(expr)` is equivalent to `&raw const expr`. The macro is *soft-deprecated*;
22782278
/// use `&raw const` instead.
22792279
///
2280+
/// It is still an open question under which conditions writing through an `addr_of!`-created
2281+
/// pointer is permitted. If the place `expr` evaluates to is based on a raw pointer, then the
2282+
/// result of `addr_of!` inherits all permissions from that raw pointer. However, if the place is
2283+
/// based on a reference, local variable, or `static`, then until all details are decided, the same
2284+
/// rules as for shared references apply: it is UB to write through a pointer created with this
2285+
/// operation, except for bytes located inside an `UnsafeCell`. Use `&raw mut` (or [`addr_of_mut`])
2286+
/// to create a raw pointer that definitely permits mutation.
2287+
///
22802288
/// Creating a reference with `&`/`&mut` is only allowed if the pointer is properly aligned
22812289
/// and points to initialized data. For cases where those requirements do not hold,
22822290
/// raw pointers should be used instead. However, `&expr as *const _` creates a reference

Diff for: ‎library/core/src/time.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ impl Duration {
250250
/// ```
251251
/// use std::time::Duration;
252252
///
253-
/// let duration = Duration::from_millis(2569);
253+
/// let duration = Duration::from_millis(2_569);
254254
///
255255
/// assert_eq!(2, duration.as_secs());
256256
/// assert_eq!(569_000_000, duration.subsec_nanos());
@@ -279,7 +279,7 @@ impl Duration {
279279
/// let duration = Duration::from_micros(1_000_002);
280280
///
281281
/// assert_eq!(1, duration.as_secs());
282-
/// assert_eq!(2000, duration.subsec_nanos());
282+
/// assert_eq!(2_000, duration.subsec_nanos());
283283
/// ```
284284
#[stable(feature = "duration_from_micros", since = "1.27.0")]
285285
#[must_use]
@@ -472,7 +472,7 @@ impl Duration {
472472
/// ```
473473
/// use std::time::Duration;
474474
///
475-
/// let duration = Duration::new(5, 730023852);
475+
/// let duration = Duration::new(5, 730_023_852);
476476
/// assert_eq!(duration.as_secs(), 5);
477477
/// ```
478478
///
@@ -501,7 +501,7 @@ impl Duration {
501501
/// ```
502502
/// use std::time::Duration;
503503
///
504-
/// let duration = Duration::from_millis(5432);
504+
/// let duration = Duration::from_millis(5_432);
505505
/// assert_eq!(duration.as_secs(), 5);
506506
/// assert_eq!(duration.subsec_millis(), 432);
507507
/// ```
@@ -547,7 +547,7 @@ impl Duration {
547547
/// ```
548548
/// use std::time::Duration;
549549
///
550-
/// let duration = Duration::from_millis(5010);
550+
/// let duration = Duration::from_millis(5_010);
551551
/// assert_eq!(duration.as_secs(), 5);
552552
/// assert_eq!(duration.subsec_nanos(), 10_000_000);
553553
/// ```
@@ -566,8 +566,8 @@ impl Duration {
566566
/// ```
567567
/// use std::time::Duration;
568568
///
569-
/// let duration = Duration::new(5, 730023852);
570-
/// assert_eq!(duration.as_millis(), 5730);
569+
/// let duration = Duration::new(5, 730_023_852);
570+
/// assert_eq!(duration.as_millis(), 5_730);
571571
/// ```
572572
#[stable(feature = "duration_as_u128", since = "1.33.0")]
573573
#[rustc_const_stable(feature = "duration_as_u128", since = "1.33.0")]
@@ -584,8 +584,8 @@ impl Duration {
584584
/// ```
585585
/// use std::time::Duration;
586586
///
587-
/// let duration = Duration::new(5, 730023852);
588-
/// assert_eq!(duration.as_micros(), 5730023);
587+
/// let duration = Duration::new(5, 730_023_852);
588+
/// assert_eq!(duration.as_micros(), 5_730_023);
589589
/// ```
590590
#[stable(feature = "duration_as_u128", since = "1.33.0")]
591591
#[rustc_const_stable(feature = "duration_as_u128", since = "1.33.0")]
@@ -602,8 +602,8 @@ impl Duration {
602602
/// ```
603603
/// use std::time::Duration;
604604
///
605-
/// let duration = Duration::new(5, 730023852);
606-
/// assert_eq!(duration.as_nanos(), 5730023852);
605+
/// let duration = Duration::new(5, 730_023_852);
606+
/// assert_eq!(duration.as_nanos(), 5_730_023_852);
607607
/// ```
608608
#[stable(feature = "duration_as_u128", since = "1.33.0")]
609609
#[rustc_const_stable(feature = "duration_as_u128", since = "1.33.0")]
@@ -879,7 +879,7 @@ impl Duration {
879879
/// use std::time::Duration;
880880
///
881881
/// let dur = Duration::new(2, 345_678_000);
882-
/// assert_eq!(dur.as_millis_f64(), 2345.678);
882+
/// assert_eq!(dur.as_millis_f64(), 2_345.678);
883883
/// ```
884884
#[unstable(feature = "duration_millis_float", issue = "122451")]
885885
#[must_use]
@@ -900,7 +900,7 @@ impl Duration {
900900
/// use std::time::Duration;
901901
///
902902
/// let dur = Duration::new(2, 345_678_000);
903-
/// assert_eq!(dur.as_millis_f32(), 2345.678);
903+
/// assert_eq!(dur.as_millis_f32(), 2_345.678);
904904
/// ```
905905
#[unstable(feature = "duration_millis_float", issue = "122451")]
906906
#[must_use]
@@ -1017,7 +1017,7 @@ impl Duration {
10171017
///
10181018
/// let dur = Duration::new(2, 700_000_000);
10191019
/// assert_eq!(dur.mul_f32(3.14), Duration::new(8, 478_000_641));
1020-
/// assert_eq!(dur.mul_f32(3.14e5), Duration::new(847800, 0));
1020+
/// assert_eq!(dur.mul_f32(3.14e5), Duration::new(847_800, 0));
10211021
/// ```
10221022
#[stable(feature = "duration_float", since = "1.38.0")]
10231023
#[must_use = "this returns the result of the operation, \

Diff for: ‎src/bootstrap/src/core/build_steps/compile.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,12 @@ impl Step for Rustc {
931931
// NOTE: the ABI of the beta compiler is different from the ABI of the downloaded compiler,
932932
// so its artifacts can't be reused.
933933
if builder.download_rustc() && compiler.stage != 0 {
934-
builder.ensure(Sysroot { compiler, force_recompile: false });
934+
let sysroot = builder.ensure(Sysroot { compiler, force_recompile: false });
935+
cp_rustc_component_to_ci_sysroot(
936+
builder,
937+
&sysroot,
938+
builder.config.ci_rustc_dev_contents(),
939+
);
935940
return compiler.stage;
936941
}
937942

Diff for: ‎src/bootstrap/src/core/build_steps/doc.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1186,6 +1186,9 @@ impl Step for RustcBook {
11861186
cmd.arg("--rustc");
11871187
cmd.arg(&rustc);
11881188
cmd.arg("--rustc-target").arg(self.target.rustc_target_arg());
1189+
if let Some(target_linker) = builder.linker(self.target) {
1190+
cmd.arg("--rustc-linker").arg(target_linker);
1191+
}
11891192
if builder.is_verbose() {
11901193
cmd.arg("--verbose");
11911194
}

Diff for: ‎src/bootstrap/src/core/build_steps/test.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -3526,11 +3526,13 @@ impl Step for TestFloatParse {
35263526

35273527
fn run(self, builder: &Builder<'_>) {
35283528
let bootstrap_host = builder.config.build;
3529-
let compiler = builder.compiler(0, bootstrap_host);
3529+
let compiler = builder.compiler(builder.top_stage, bootstrap_host);
35303530
let path = self.path.to_str().unwrap();
35313531
let crate_name = self.path.components().last().unwrap().as_os_str().to_str().unwrap();
35323532

3533-
builder.ensure(compile::Std::new(compiler, self.host));
3533+
if !builder.download_rustc() {
3534+
builder.ensure(compile::Std::new(compiler, self.host));
3535+
}
35343536

35353537
// Run any unit tests in the crate
35363538
let cargo_test = tool::prepare_tool_cargo(

Diff for: ‎src/bootstrap/src/lib.rs

+14-8
Original file line numberDiff line numberDiff line change
@@ -332,14 +332,20 @@ impl Build {
332332
.trim()
333333
.to_string();
334334

335-
let initial_libdir = initial_target_dir
336-
.parent()
337-
.unwrap()
338-
.parent()
339-
.unwrap()
340-
.strip_prefix(&initial_sysroot)
341-
.unwrap()
342-
.to_path_buf();
335+
// FIXME(Zalathar): Determining this path occasionally fails locally for
336+
// unknown reasons, so we print some extra context to help track down why.
337+
let find_initial_libdir = || {
338+
let initial_libdir =
339+
initial_target_dir.parent()?.parent()?.strip_prefix(&initial_sysroot).ok()?;
340+
Some(initial_libdir.to_path_buf())
341+
};
342+
let Some(initial_libdir) = find_initial_libdir() else {
343+
panic!(
344+
"couldn't determine `initial_libdir` \
345+
from target dir {initial_target_dir:?} \
346+
and sysroot {initial_sysroot:?}"
347+
)
348+
};
343349

344350
let version = std::fs::read_to_string(src.join("src").join("version"))
345351
.expect("failed to read src/version");

0 commit comments

Comments
 (0)