Skip to content

Commit e1f0920

Browse files
borsbors
committed
Auto merge of rust-lang#136433 - matthiaskrgr:rollup-co27itw, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu) - rust-lang#136133 (Fix sentence in process::abort) - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs) - rust-lang#136328 (Rework "long type names" printing logic) - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`) - rust-lang#136368 (Make comma separated lists of anything easier to make for errors) - rust-lang#136412 (Tweak fn pointer suggestion span) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6dd75f0 + 44def58 commit e1f0920

File tree

95 files changed

+725
-1131
lines changed

Some content is hidden

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

95 files changed

+725
-1131
lines changed

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,10 +418,10 @@ fn compute_hir_hash(
418418
pub fn lower_to_hir(tcx: TyCtxt<'_>, (): ()) -> hir::Crate<'_> {
419419
let sess = tcx.sess;
420420
// Queries that borrow `resolver_for_lowering`.
421-
tcx.ensure_with_value().output_filenames(());
422-
tcx.ensure_with_value().early_lint_checks(());
423-
tcx.ensure_with_value().debugger_visualizers(LOCAL_CRATE);
424-
tcx.ensure_with_value().get_lang_items(());
421+
tcx.ensure_done().output_filenames(());
422+
tcx.ensure_done().early_lint_checks(());
423+
tcx.ensure_done().debugger_visualizers(LOCAL_CRATE);
424+
tcx.ensure_done().get_lang_items(());
425425
let (mut resolver, krate) = tcx.resolver_for_lowering().steal();
426426

427427
let ast_index = index_crate(&resolver.node_id_to_def_id, &krate);

‎compiler/rustc_borrowck/messages.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ borrowck_lifetime_constraints_error =
9292
borrowck_limitations_implies_static =
9393
due to current limitations in the borrow checker, this implies a `'static` lifetime
9494
95-
borrowck_long_type_consider_verbose = consider using `--verbose` to print the full type name to the console
96-
borrowck_long_type_full_path = the full type name has been written to '{$path}'
97-
9895
borrowck_move_closure_suggestion =
9996
consider adding 'move' keyword before the nested closure
10097

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
289289
None => "value".to_owned(),
290290
};
291291
if needs_note {
292-
let mut path = None;
293-
let ty = self.infcx.tcx.short_ty_string(ty, &mut path);
292+
let ty = self.infcx.tcx.short_string(ty, err.long_ty_path());
294293
if let Some(local) = place.as_local() {
295294
let span = self.body.local_decls[local].source_info.span;
296295
err.subdiagnostic(crate::session_diagnostics::TypeNoCopy::Label {
@@ -306,11 +305,6 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
306305
place: &note_msg,
307306
});
308307
};
309-
if let Some(path) = path {
310-
err.subdiagnostic(crate::session_diagnostics::LongTypePath {
311-
path: path.display().to_string(),
312-
});
313-
}
314308
}
315309

316310
if let UseSpans::FnSelfUse {

‎compiler/rustc_borrowck/src/diagnostics/mod.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::collections::BTreeMap;
44

55
use rustc_abi::{FieldIdx, VariantIdx};
66
use rustc_data_structures::fx::FxIndexMap;
7-
use rustc_errors::{Applicability, Diag, EmissionGuarantee, MultiSpan};
7+
use rustc_errors::{Applicability, Diag, EmissionGuarantee, MultiSpan, listify};
88
use rustc_hir::def::{CtorKind, Namespace};
99
use rustc_hir::{self as hir, CoroutineKind, LangItem};
1010
use rustc_index::IndexSlice;
@@ -29,7 +29,7 @@ use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
2929
use rustc_trait_selection::error_reporting::traits::call_kind::{CallDesugaringKind, call_kind};
3030
use rustc_trait_selection::infer::InferCtxtExt;
3131
use rustc_trait_selection::traits::{
32-
FulfillmentErrorCode, type_known_to_meet_bound_modulo_regions,
32+
FulfillmentError, FulfillmentErrorCode, type_known_to_meet_bound_modulo_regions,
3333
};
3434
use tracing::debug;
3535

@@ -1434,17 +1434,15 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
14341434
error.obligation.predicate,
14351435
)
14361436
}
1437-
[errors @ .., last] => {
1437+
_ => {
14381438
format!(
14391439
"you could `clone` the value and consume it, if the \
1440-
following trait bounds could be satisfied: \
1441-
{} and `{}`",
1442-
errors
1443-
.iter()
1444-
.map(|e| format!("`{}`", e.obligation.predicate))
1445-
.collect::<Vec<_>>()
1446-
.join(", "),
1447-
last.obligation.predicate,
1440+
following trait bounds could be satisfied: {}",
1441+
listify(&errors, |e: &FulfillmentError<'tcx>| format!(
1442+
"`{}`",
1443+
e.obligation.predicate
1444+
))
1445+
.unwrap(),
14481446
)
14491447
}
14501448
};

‎compiler/rustc_borrowck/src/diagnostics/move_errors.rs

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -596,19 +596,13 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
596596
self.suggest_cloning(err, place_ty, expr, None);
597597
}
598598

599-
let mut path = None;
600-
let ty = self.infcx.tcx.short_ty_string(place_ty, &mut path);
599+
let ty = self.infcx.tcx.short_string(place_ty, err.long_ty_path());
601600
err.subdiagnostic(crate::session_diagnostics::TypeNoCopy::Label {
602601
is_partial_move: false,
603602
ty,
604603
place: &place_desc,
605604
span,
606605
});
607-
if let Some(path) = path {
608-
err.subdiagnostic(crate::session_diagnostics::LongTypePath {
609-
path: path.display().to_string(),
610-
});
611-
}
612606
} else {
613607
binds_to.sort();
614608
binds_to.dedup();
@@ -635,19 +629,13 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
635629
self.suggest_cloning(err, place_ty, expr, Some(use_spans));
636630
}
637631

638-
let mut path = None;
639-
let ty = self.infcx.tcx.short_ty_string(place_ty, &mut path);
632+
let ty = self.infcx.tcx.short_string(place_ty, err.long_ty_path());
640633
err.subdiagnostic(crate::session_diagnostics::TypeNoCopy::Label {
641634
is_partial_move: false,
642635
ty,
643636
place: &place_desc,
644637
span: use_span,
645638
});
646-
if let Some(path) = path {
647-
err.subdiagnostic(crate::session_diagnostics::LongTypePath {
648-
path: path.display().to_string(),
649-
});
650-
}
651639

652640
use_spans.args_subdiag(err, |args_span| {
653641
crate::session_diagnostics::CaptureArgLabel::MoveOutPlace {
@@ -845,19 +833,13 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
845833
self.suggest_cloning(err, bind_to.ty, expr, None);
846834
}
847835

848-
let mut path = None;
849-
let ty = self.infcx.tcx.short_ty_string(bind_to.ty, &mut path);
836+
let ty = self.infcx.tcx.short_string(bind_to.ty, err.long_ty_path());
850837
err.subdiagnostic(crate::session_diagnostics::TypeNoCopy::Label {
851838
is_partial_move: false,
852839
ty,
853840
place: place_desc,
854841
span: binding_span,
855842
});
856-
if let Some(path) = path {
857-
err.subdiagnostic(crate::session_diagnostics::LongTypePath {
858-
path: path.display().to_string(),
859-
});
860-
}
861843
}
862844
}
863845

‎compiler/rustc_borrowck/src/session_diagnostics.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -458,13 +458,6 @@ pub(crate) enum OnClosureNote<'a> {
458458
},
459459
}
460460

461-
#[derive(Subdiagnostic)]
462-
#[note(borrowck_long_type_full_path)]
463-
#[note(borrowck_long_type_consider_verbose)]
464-
pub(crate) struct LongTypePath {
465-
pub(crate) path: String,
466-
}
467-
468461
#[derive(Subdiagnostic)]
469462
pub(crate) enum TypeNoCopy<'a> {
470463
#[label(borrowck_ty_no_impl_copy)]

‎compiler/rustc_builtin_macros/src/format.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ use rustc_ast::{
88
token,
99
};
1010
use rustc_data_structures::fx::FxHashSet;
11-
use rustc_errors::{Applicability, Diag, MultiSpan, PResult, SingleLabelManySpans};
11+
use rustc_errors::{
12+
Applicability, Diag, MultiSpan, PResult, SingleLabelManySpans, listify, pluralize,
13+
};
1214
use rustc_expand::base::*;
1315
use rustc_lint_defs::builtin::NAMED_ARGUMENTS_USED_POSITIONALLY;
1416
use rustc_lint_defs::{BufferedEarlyLint, BuiltinLintDiag, LintId};
@@ -975,15 +977,11 @@ fn report_invalid_references(
975977
} else {
976978
MultiSpan::from_spans(invalid_refs.iter().filter_map(|&(_, span, _, _)| span).collect())
977979
};
978-
let arg_list = if let &[index] = &indexes[..] {
979-
format!("argument {index}")
980-
} else {
981-
let tail = indexes.pop().unwrap();
982-
format!(
983-
"arguments {head} and {tail}",
984-
head = indexes.into_iter().map(|i| i.to_string()).collect::<Vec<_>>().join(", ")
985-
)
986-
};
980+
let arg_list = format!(
981+
"argument{} {}",
982+
pluralize!(indexes.len()),
983+
listify(&indexes, |i: &usize| i.to_string()).unwrap_or_default()
984+
);
987985
e = ecx.dcx().struct_span_err(
988986
span,
989987
format!("invalid reference to positional {arg_list} ({num_args_desc})"),

‎compiler/rustc_codegen_cranelift/src/driver/aot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ pub(crate) fn run_aot(
692692

693693
if tcx.dep_graph.is_fully_enabled() {
694694
for cgu in cgus {
695-
tcx.ensure().codegen_unit(cgu.name());
695+
tcx.ensure_ok().codegen_unit(cgu.name());
696696
}
697697
}
698698

‎compiler/rustc_codegen_ssa/src/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ pub fn codegen_crate<B: ExtraBackendMethods>(
634634
// unnecessarily.
635635
if tcx.dep_graph.is_fully_enabled() {
636636
for cgu in codegen_units {
637-
tcx.ensure().codegen_unit(cgu.name());
637+
tcx.ensure_ok().codegen_unit(cgu.name());
638638
}
639639
}
640640

‎compiler/rustc_driver_impl/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ pub fn run_compiler(at_args: &[String], callbacks: &mut (dyn Callbacks + Send))
317317
if let Some(pp_mode) = sess.opts.pretty {
318318
if pp_mode.needs_ast_map() {
319319
create_and_enter_global_ctxt(compiler, krate, |tcx| {
320-
tcx.ensure().early_lint_checks(());
320+
tcx.ensure_ok().early_lint_checks(());
321321
pretty::print(sess, pp_mode, pretty::PrintExtra::NeedsAstMap { tcx });
322322
passes::write_dep_info(tcx);
323323
});
@@ -365,7 +365,7 @@ pub fn run_compiler(at_args: &[String], callbacks: &mut (dyn Callbacks + Send))
365365
return early_exit();
366366
}
367367

368-
tcx.ensure().analysis(());
368+
tcx.ensure_ok().analysis(());
369369

370370
if callbacks.after_analysis(compiler, tcx) == Compilation::Stop {
371371
return early_exit();

0 commit comments

Comments
 (0)