Skip to content

Commit e1333a3

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#138610 - oli-obk:no-sort-hir-ids, r=compiler-errors
impl !PartialOrd for HirId revive of rust-lang#92233 Another checkbox of rust-lang#90317, another small step in making incremental less likely to die in horrible ways
2 parents ae9173d + 7103ce7 commit e1333a3

File tree

38 files changed

+294
-239
lines changed

38 files changed

+294
-239
lines changed

Diff for: ‎compiler/rustc_codegen_ssa/src/back/link.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -959,9 +959,9 @@ fn link_natively(
959959
}
960960
}
961961

962-
let (level, src) = codegen_results.crate_info.lint_levels.linker_messages;
962+
let level = codegen_results.crate_info.lint_levels.linker_messages;
963963
let lint = |msg| {
964-
lint_level(sess, LINKER_MESSAGES, level, src, None, |diag| {
964+
lint_level(sess, LINKER_MESSAGES, level, None, |diag| {
965965
LinkerOutput { inner: msg }.decorate_lint(diag)
966966
})
967967
};

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use rustc_hir::CRATE_HIR_ID;
3434
use rustc_hir::def_id::CrateNum;
3535
use rustc_macros::{Decodable, Encodable, HashStable};
3636
use rustc_middle::dep_graph::WorkProduct;
37-
use rustc_middle::lint::LintLevelSource;
37+
use rustc_middle::lint::LevelAndSource;
3838
use rustc_middle::middle::debugger_visualizer::DebuggerVisualizerFile;
3939
use rustc_middle::middle::dependency_format::Dependencies;
4040
use rustc_middle::middle::exported_symbols::SymbolExportKind;
@@ -45,7 +45,6 @@ use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
4545
use rustc_session::Session;
4646
use rustc_session::config::{CrateType, OutputFilenames, OutputType, RUST_CGU_EXT};
4747
use rustc_session::cstore::{self, CrateSource};
48-
use rustc_session::lint::Level;
4948
use rustc_session::lint::builtin::LINKER_MESSAGES;
5049
use rustc_session::utils::NativeLibKind;
5150
use rustc_span::Symbol;
@@ -341,7 +340,7 @@ impl CodegenResults {
341340
/// Instead, encode exactly the information we need.
342341
#[derive(Copy, Clone, Debug, Encodable, Decodable)]
343342
pub struct CodegenLintLevels {
344-
linker_messages: (Level, LintLevelSource),
343+
linker_messages: LevelAndSource,
345344
}
346345

347346
impl CodegenLintLevels {

Diff for: ‎compiler/rustc_const_eval/src/const_eval/machine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ impl<'tcx> interpret::Machine<'tcx> for CompileTimeMachine<'tcx> {
546546
rustc_session::lint::builtin::LONG_RUNNING_CONST_EVAL,
547547
hir_id,
548548
)
549-
.0
549+
.level
550550
.is_error();
551551
let span = ecx.cur_span();
552552
ecx.tcx.emit_node_span_lint(

Diff for: ‎compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ fn annotation_level_for_level(level: Level) -> annotate_snippets::Level {
9191
Level::Bug | Level::Fatal | Level::Error | Level::DelayedBug => {
9292
annotate_snippets::Level::Error
9393
}
94-
Level::ForceWarning(_) | Level::Warning => annotate_snippets::Level::Warning,
94+
Level::ForceWarning | Level::Warning => annotate_snippets::Level::Warning,
9595
Level::Note | Level::OnceNote => annotate_snippets::Level::Note,
9696
Level::Help | Level::OnceHelp => annotate_snippets::Level::Help,
9797
// FIXME(#59346): Not sure how to map this level
9898
Level::FailureNote => annotate_snippets::Level::Error,
9999
Level::Allow => panic!("Should not call with Allow"),
100-
Level::Expect(_) => panic!("Should not call with Expect"),
100+
Level::Expect => panic!("Should not call with Expect"),
101101
}
102102
}
103103

Diff for: ‎compiler/rustc_errors/src/diagnostic.rs

+17-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::thread::panicking;
99

1010
use rustc_data_structures::fx::FxIndexMap;
1111
use rustc_error_messages::{FluentValue, fluent_value_from_str_list_sep_by_and};
12-
use rustc_lint_defs::Applicability;
12+
use rustc_lint_defs::{Applicability, LintExpectationId};
1313
use rustc_macros::{Decodable, Encodable};
1414
use rustc_span::source_map::Spanned;
1515
use rustc_span::{DUMMY_SP, Span, Symbol};
@@ -296,6 +296,7 @@ pub struct DiagInner {
296296

297297
pub messages: Vec<(DiagMessage, Style)>,
298298
pub code: Option<ErrCode>,
299+
pub lint_id: Option<LintExpectationId>,
299300
pub span: MultiSpan,
300301
pub children: Vec<Subdiag>,
301302
pub suggestions: Suggestions,
@@ -324,6 +325,7 @@ impl DiagInner {
324325
pub fn new_with_messages(level: Level, messages: Vec<(DiagMessage, Style)>) -> Self {
325326
DiagInner {
326327
level,
328+
lint_id: None,
327329
messages,
328330
code: None,
329331
span: MultiSpan::new(),
@@ -346,15 +348,15 @@ impl DiagInner {
346348
match self.level {
347349
Level::Bug | Level::Fatal | Level::Error | Level::DelayedBug => true,
348350

349-
Level::ForceWarning(_)
351+
Level::ForceWarning
350352
| Level::Warning
351353
| Level::Note
352354
| Level::OnceNote
353355
| Level::Help
354356
| Level::OnceHelp
355357
| Level::FailureNote
356358
| Level::Allow
357-
| Level::Expect(_) => false,
359+
| Level::Expect => false,
358360
}
359361
}
360362

@@ -365,7 +367,7 @@ impl DiagInner {
365367

366368
pub(crate) fn is_force_warn(&self) -> bool {
367369
match self.level {
368-
Level::ForceWarning(_) => {
370+
Level::ForceWarning => {
369371
assert!(self.is_lint.is_some());
370372
true
371373
}
@@ -1259,6 +1261,17 @@ impl<'a, G: EmissionGuarantee> Diag<'a, G> {
12591261
self
12601262
} }
12611263

1264+
with_fn! { with_lint_id,
1265+
/// Add an argument.
1266+
#[rustc_lint_diagnostics]
1267+
pub fn lint_id(
1268+
&mut self,
1269+
id: LintExpectationId,
1270+
) -> &mut Self {
1271+
self.lint_id = Some(id);
1272+
self
1273+
} }
1274+
12621275
with_fn! { with_primary_message,
12631276
/// Add a primary message.
12641277
#[rustc_lint_diagnostics]

Diff for: ‎compiler/rustc_errors/src/json.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl Emitter for JsonEmitter {
144144
//
145145
// So to avoid ICEs and confused users we "upgrade" the lint level for
146146
// those `FutureBreakageItem` to warn.
147-
if matches!(diag.level, crate::Level::Allow | crate::Level::Expect(..)) {
147+
if matches!(diag.level, crate::Level::Allow | crate::Level::Expect) {
148148
diag.level = crate::Level::Warning;
149149
}
150150
FutureBreakageItem {

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

+19-20
Original file line numberDiff line numberDiff line change
@@ -905,8 +905,8 @@ impl<'a> DiagCtxtHandle<'a> {
905905
DelayedBug => {
906906
return self.inner.borrow_mut().emit_diagnostic(diag, self.tainted_with_errors);
907907
}
908-
ForceWarning(_) | Warning | Note | OnceNote | Help | OnceHelp | FailureNote | Allow
909-
| Expect(_) => None,
908+
ForceWarning | Warning | Note | OnceNote | Help | OnceHelp | FailureNote | Allow
909+
| Expect => None,
910910
};
911911

912912
// FIXME(Centril, #69537): Consider reintroducing panic on overwriting a stashed diagnostic
@@ -1045,7 +1045,7 @@ impl<'a> DiagCtxtHandle<'a> {
10451045
// Use `ForceWarning` rather than `Warning` to guarantee emission, e.g. with a
10461046
// configuration like `--cap-lints allow --force-warn bare_trait_objects`.
10471047
inner.emit_diagnostic(
1048-
DiagInner::new(ForceWarning(None), DiagMessage::Str(warnings)),
1048+
DiagInner::new(ForceWarning, DiagMessage::Str(warnings)),
10491049
None,
10501050
);
10511051
}
@@ -1450,7 +1450,7 @@ impl<'a> DiagCtxtHandle<'a> {
14501450
#[rustc_lint_diagnostics]
14511451
#[track_caller]
14521452
pub fn struct_expect(self, msg: impl Into<DiagMessage>, id: LintExpectationId) -> Diag<'a, ()> {
1453-
Diag::new(self, Expect(id), msg)
1453+
Diag::new(self, Expect, msg).with_lint_id(id)
14541454
}
14551455
}
14561456

@@ -1510,7 +1510,7 @@ impl DiagCtxtInner {
15101510
// Future breakages aren't emitted if they're `Level::Allow` or
15111511
// `Level::Expect`, but they still need to be constructed and
15121512
// stashed below, so they'll trigger the must_produce_diag check.
1513-
assert_matches!(diagnostic.level, Error | Warning | Allow | Expect(_));
1513+
assert_matches!(diagnostic.level, Error | Warning | Allow | Expect);
15141514
self.future_breakage_diagnostics.push(diagnostic.clone());
15151515
}
15161516

@@ -1558,7 +1558,7 @@ impl DiagCtxtInner {
15581558
};
15591559
}
15601560
}
1561-
ForceWarning(None) => {} // `ForceWarning(Some(...))` is below, with `Expect`
1561+
ForceWarning if diagnostic.lint_id.is_none() => {} // `ForceWarning(Some(...))` is below, with `Expect`
15621562
Warning => {
15631563
if !self.flags.can_emit_warnings {
15641564
// We are not emitting warnings.
@@ -1580,9 +1580,9 @@ impl DiagCtxtInner {
15801580
}
15811581
return None;
15821582
}
1583-
Expect(expect_id) | ForceWarning(Some(expect_id)) => {
1584-
self.fulfilled_expectations.insert(expect_id);
1585-
if let Expect(_) = diagnostic.level {
1583+
Expect | ForceWarning => {
1584+
self.fulfilled_expectations.insert(diagnostic.lint_id.unwrap());
1585+
if let Expect = diagnostic.level {
15861586
// Nothing emitted here for expected lints.
15871587
TRACK_DIAGNOSTIC(diagnostic, &mut |_| None);
15881588
self.suppressed_expected_diag = true;
@@ -1631,7 +1631,7 @@ impl DiagCtxtInner {
16311631

16321632
if is_error {
16331633
self.deduplicated_err_count += 1;
1634-
} else if matches!(diagnostic.level, ForceWarning(_) | Warning) {
1634+
} else if matches!(diagnostic.level, ForceWarning | Warning) {
16351635
self.deduplicated_warn_count += 1;
16361636
}
16371637
self.has_printed = true;
@@ -1899,9 +1899,9 @@ pub enum Level {
18991899
/// A `force-warn` lint warning about the code being compiled. Does not prevent compilation
19001900
/// from finishing.
19011901
///
1902-
/// The [`LintExpectationId`] is used for expected lint diagnostics. In all other cases this
1902+
/// Requires a [`LintExpectationId`] for expected lint diagnostics. In all other cases this
19031903
/// should be `None`.
1904-
ForceWarning(Option<LintExpectationId>),
1904+
ForceWarning,
19051905

19061906
/// A warning about the code being compiled. Does not prevent compilation from finishing.
19071907
/// Will be skipped if `can_emit_warnings` is false.
@@ -1926,8 +1926,8 @@ pub enum Level {
19261926
/// Only used for lints.
19271927
Allow,
19281928

1929-
/// Only used for lints.
1930-
Expect(LintExpectationId),
1929+
/// Only used for lints. Requires a [`LintExpectationId`] for silencing the lints.
1930+
Expect,
19311931
}
19321932

19331933
impl fmt::Display for Level {
@@ -1943,7 +1943,7 @@ impl Level {
19431943
Bug | Fatal | Error | DelayedBug => {
19441944
spec.set_fg(Some(Color::Red)).set_intense(true);
19451945
}
1946-
ForceWarning(_) | Warning => {
1946+
ForceWarning | Warning => {
19471947
spec.set_fg(Some(Color::Yellow)).set_intense(cfg!(windows));
19481948
}
19491949
Note | OnceNote => {
@@ -1953,7 +1953,7 @@ impl Level {
19531953
spec.set_fg(Some(Color::Cyan)).set_intense(true);
19541954
}
19551955
FailureNote => {}
1956-
Allow | Expect(_) => unreachable!(),
1956+
Allow | Expect => unreachable!(),
19571957
}
19581958
spec
19591959
}
@@ -1962,11 +1962,11 @@ impl Level {
19621962
match self {
19631963
Bug | DelayedBug => "error: internal compiler error",
19641964
Fatal | Error => "error",
1965-
ForceWarning(_) | Warning => "warning",
1965+
ForceWarning | Warning => "warning",
19661966
Note | OnceNote => "note",
19671967
Help | OnceHelp => "help",
19681968
FailureNote => "failure-note",
1969-
Allow | Expect(_) => unreachable!(),
1969+
Allow | Expect => unreachable!(),
19701970
}
19711971
}
19721972

@@ -1977,8 +1977,7 @@ impl Level {
19771977
// Can this level be used in a subdiagnostic message?
19781978
fn can_be_subdiag(&self) -> bool {
19791979
match self {
1980-
Bug | DelayedBug | Fatal | Error | ForceWarning(_) | FailureNote | Allow
1981-
| Expect(_) => false,
1980+
Bug | DelayedBug | Fatal | Error | ForceWarning | FailureNote | Allow | Expect => false,
19821981

19831982
Warning | Note | Help | OnceNote | OnceHelp => true,
19841983
}

Diff for: ‎compiler/rustc_hir/src/hir_id.rs

+6-16
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ pub struct HirId {
8383
pub local_id: ItemLocalId,
8484
}
8585

86+
// To ensure correctness of incremental compilation,
87+
// `HirId` must not implement `Ord` or `PartialOrd`.
88+
// See https://github.com/rust-lang/rust/issues/90317.
89+
impl !Ord for HirId {}
90+
impl !PartialOrd for HirId {}
91+
8692
impl Debug for HirId {
8793
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
8894
// Example: HirId(DefId(0:1 ~ aa[7697]::{use#0}).10)
@@ -116,10 +122,6 @@ impl HirId {
116122
pub fn make_owner(owner: LocalDefId) -> Self {
117123
Self { owner: OwnerId { def_id: owner }, local_id: ItemLocalId::ZERO }
118124
}
119-
120-
pub fn index(self) -> (usize, usize) {
121-
(rustc_index::Idx::index(self.owner.def_id), rustc_index::Idx::index(self.local_id))
122-
}
123125
}
124126

125127
impl fmt::Display for HirId {
@@ -128,18 +130,6 @@ impl fmt::Display for HirId {
128130
}
129131
}
130132

131-
impl Ord for HirId {
132-
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
133-
(self.index()).cmp(&(other.index()))
134-
}
135-
}
136-
137-
impl PartialOrd for HirId {
138-
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
139-
Some(self.cmp(other))
140-
}
141-
}
142-
143133
rustc_data_structures::define_stable_id_collections!(HirIdMap, HirIdSet, HirIdMapEntry, HirId);
144134
rustc_data_structures::define_id_collections!(
145135
ItemLocalMap,

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

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#![feature(debug_closure_helpers)]
1212
#![feature(exhaustive_patterns)]
1313
#![feature(let_chains)]
14+
#![feature(negative_impls)]
1415
#![feature(never_type)]
1516
#![feature(rustc_attrs)]
1617
#![feature(variant_count)]

Diff for: ‎compiler/rustc_hir_typeck/src/upvar.rs

+11-5
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
8585
/// Intermediate format to store the hir_id pointing to the use that resulted in the
8686
/// corresponding place being captured and a String which contains the captured value's
8787
/// name (i.e: a.b.c)
88-
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
88+
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
8989
enum UpvarMigrationInfo {
9090
/// We previously captured all of `x`, but now we capture some sub-path.
9191
CapturingPrecise { source_expr: Option<HirId>, var_name: String },
@@ -1396,14 +1396,19 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
13961396
FxIndexSet::default()
13971397
};
13981398

1399-
// Combine all the captures responsible for needing migrations into one HashSet
1399+
// Combine all the captures responsible for needing migrations into one IndexSet
14001400
let mut capture_diagnostic = drop_reorder_diagnostic.clone();
14011401
for key in auto_trait_diagnostic.keys() {
14021402
capture_diagnostic.insert(key.clone());
14031403
}
14041404

14051405
let mut capture_diagnostic = capture_diagnostic.into_iter().collect::<Vec<_>>();
1406-
capture_diagnostic.sort();
1406+
capture_diagnostic.sort_by_cached_key(|info| match info {
1407+
UpvarMigrationInfo::CapturingPrecise { source_expr: _, var_name } => {
1408+
(0, Some(var_name.clone()))
1409+
}
1410+
UpvarMigrationInfo::CapturingNothing { use_span: _ } => (1, None),
1411+
});
14071412
for captures_info in capture_diagnostic {
14081413
// Get the auto trait reasons of why migration is needed because of that capture, if there are any
14091414
let capture_trait_reasons =
@@ -2325,8 +2330,9 @@ fn should_do_rust_2021_incompatible_closure_captures_analysis(
23252330
return false;
23262331
}
23272332

2328-
let (level, _) =
2329-
tcx.lint_level_at_node(lint::builtin::RUST_2021_INCOMPATIBLE_CLOSURE_CAPTURES, closure_id);
2333+
let level = tcx
2334+
.lint_level_at_node(lint::builtin::RUST_2021_INCOMPATIBLE_CLOSURE_CAPTURES, closure_id)
2335+
.level;
23302336

23312337
!matches!(level, lint::Level::Allow)
23322338
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ use rustc_hir::def_id::{CRATE_DEF_ID, DefId, LocalDefId};
2929
use rustc_hir::intravisit::FnKind as HirFnKind;
3030
use rustc_hir::{Body, FnDecl, GenericParamKind, PatKind, PredicateOrigin};
3131
use rustc_middle::bug;
32+
use rustc_middle::lint::LevelAndSource;
3233
use rustc_middle::ty::layout::LayoutOf;
3334
use rustc_middle::ty::print::with_no_trimmed_paths;
3435
use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt, Upcast, VariantDef};
@@ -694,7 +695,8 @@ impl<'tcx> LateLintPass<'tcx> for MissingDebugImplementations {
694695
}
695696

696697
// Avoid listing trait impls if the trait is allowed.
697-
let (level, _) = cx.tcx.lint_level_at_node(MISSING_DEBUG_IMPLEMENTATIONS, item.hir_id());
698+
let LevelAndSource { level, .. } =
699+
cx.tcx.lint_level_at_node(MISSING_DEBUG_IMPLEMENTATIONS, item.hir_id());
698700
if level == Level::Allow {
699701
return;
700702
}

0 commit comments

Comments
 (0)