diff --git a/Cargo.lock b/Cargo.lock
index 38b009bfc7000..923d4017c0cad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3507,7 +3507,6 @@ dependencies = [
"cc",
"either",
"itertools",
- "jobserver",
"libc",
"object 0.36.5",
"pathdiff",
diff --git a/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs b/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
index c5ebf3c547e9d..4fb7b22f2896e 100644
--- a/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
+++ b/compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
@@ -1100,12 +1100,12 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
}
let decl_span = local_decl.source_info.span;
- let label = match *local_decl.local_info() {
+ let amp_mut_sugg = match *local_decl.local_info() {
LocalInfo::User(mir::BindingForm::ImplicitSelf(_)) => {
let suggestion = suggest_ampmut_self(self.infcx.tcx, decl_span);
let additional =
local_trait.map(|span| (span, suggest_ampmut_self(self.infcx.tcx, span)));
- Some((true, decl_span, suggestion, additional))
+ Some(AmpMutSugg { has_sugg: true, span: decl_span, suggestion, additional })
}
LocalInfo::User(mir::BindingForm::Var(mir::VarBindingForm {
@@ -1150,7 +1150,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
None
}
None => {
- let (has_sugg, decl_span, sugg) = if name != kw::SelfLower {
+ if name != kw::SelfLower {
suggest_ampmut(
self.infcx.tcx,
local_decl.ty,
@@ -1165,7 +1165,12 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
..
})) => {
let sugg = suggest_ampmut_self(self.infcx.tcx, decl_span);
- (true, decl_span, sugg)
+ Some(AmpMutSugg {
+ has_sugg: true,
+ span: decl_span,
+ suggestion: sugg,
+ additional: None,
+ })
}
// explicit self (eg `self: &'a Self`)
_ => suggest_ampmut(
@@ -1176,8 +1181,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
opt_ty_info,
),
}
- };
- Some((has_sugg, decl_span, sugg, None))
+ }
}
}
}
@@ -1187,15 +1191,24 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
..
})) => {
let pattern_span: Span = local_decl.source_info.span;
- suggest_ref_mut(self.infcx.tcx, pattern_span)
- .map(|span| (true, span, "mut ".to_owned(), None))
+ suggest_ref_mut(self.infcx.tcx, pattern_span).map(|span| AmpMutSugg {
+ has_sugg: true,
+ span,
+ suggestion: "mut ".to_owned(),
+ additional: None,
+ })
}
_ => unreachable!(),
};
- match label {
- Some((true, err_help_span, suggested_code, additional)) => {
+ match amp_mut_sugg {
+ Some(AmpMutSugg {
+ has_sugg: true,
+ span: err_help_span,
+ suggestion: suggested_code,
+ additional,
+ }) => {
let mut sugg = vec![(err_help_span, suggested_code)];
if let Some(s) = additional {
sugg.push(s);
@@ -1217,7 +1230,9 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
);
}
}
- Some((false, err_label_span, message, _)) => {
+ Some(AmpMutSugg {
+ has_sugg: false, span: err_label_span, suggestion: message, ..
+ }) => {
let def_id = self.body.source.def_id();
let hir_id = if let Some(local_def_id) = def_id.as_local()
&& let Some(body) = self.infcx.tcx.hir().maybe_body_owned_by(local_def_id)
@@ -1422,6 +1437,13 @@ fn suggest_ampmut_self<'tcx>(tcx: TyCtxt<'tcx>, span: Span) -> String {
}
}
+struct AmpMutSugg {
+ has_sugg: bool,
+ span: Span,
+ suggestion: String,
+ additional: Option<(Span, String)>,
+}
+
// When we want to suggest a user change a local variable to be a `&mut`, there
// are three potential "obvious" things to highlight:
//
@@ -1443,7 +1465,7 @@ fn suggest_ampmut<'tcx>(
decl_span: Span,
opt_assignment_rhs_span: Option<Span>,
opt_ty_info: Option<Span>,
-) -> (bool, Span, String) {
+) -> Option<AmpMutSugg> {
// if there is a RHS and it starts with a `&` from it, then check if it is
// mutable, and if not, put suggest putting `mut ` to make it mutable.
// we don't have to worry about lifetime annotations here because they are
@@ -1456,6 +1478,11 @@ fn suggest_ampmut<'tcx>(
&& let Ok(src) = tcx.sess.source_map().span_to_snippet(assignment_rhs_span)
&& let Some(stripped) = src.strip_prefix('&')
{
+ let is_raw_ref = stripped.trim_start().starts_with("raw ");
+ // We don't support raw refs yet
+ if is_raw_ref {
+ return None;
+ }
let is_mut = if let Some(rest) = stripped.trim_start().strip_prefix("mut") {
match rest.chars().next() {
// e.g. `&mut x`
@@ -1479,7 +1506,12 @@ fn suggest_ampmut<'tcx>(
// FIXME(Ezrashaw): returning is bad because we still might want to
// update the annotated type, see #106857.
- return (true, span, "mut ".to_owned());
+ return Some(AmpMutSugg {
+ has_sugg: true,
+ span,
+ suggestion: "mut ".to_owned(),
+ additional: None,
+ });
}
}
@@ -1504,18 +1536,23 @@ fn suggest_ampmut<'tcx>(
&& let Some(ws_pos) = src.find(char::is_whitespace)
{
let span = span.with_lo(span.lo() + BytePos(ws_pos as u32)).shrink_to_lo();
- (true, span, " mut".to_owned())
+ Some(AmpMutSugg { has_sugg: true, span, suggestion: " mut".to_owned(), additional: None })
// if there is already a binding, we modify it to be `mut`
} else if binding_exists {
// shrink the span to just after the `&` in `&variable`
let span = span.with_lo(span.lo() + BytePos(1)).shrink_to_lo();
- (true, span, "mut ".to_owned())
+ Some(AmpMutSugg { has_sugg: true, span, suggestion: "mut ".to_owned(), additional: None })
} else {
// otherwise, suggest that the user annotates the binding; we provide the
// type of the local.
let ty = decl_ty.builtin_deref(true).unwrap();
- (false, span, format!("{}mut {}", if decl_ty.is_ref() { "&" } else { "*" }, ty))
+ Some(AmpMutSugg {
+ has_sugg: false,
+ span,
+ suggestion: format!("{}mut {}", if decl_ty.is_ref() { "&" } else { "*" }, ty),
+ additional: None,
+ })
}
}
diff --git a/compiler/rustc_codegen_cranelift/src/concurrency_limiter.rs b/compiler/rustc_codegen_cranelift/src/concurrency_limiter.rs
index 2093b49ff31a7..b5a81fc11d57b 100644
--- a/compiler/rustc_codegen_cranelift/src/concurrency_limiter.rs
+++ b/compiler/rustc_codegen_cranelift/src/concurrency_limiter.rs
@@ -1,8 +1,7 @@
use std::sync::{Arc, Condvar, Mutex};
-use jobserver::HelperThread;
+use rustc_data_structures::jobserver::{self, HelperThread};
use rustc_errors::DiagCtxtHandle;
-use rustc_session::Session;
// FIXME don't panic when a worker thread panics
@@ -14,14 +13,13 @@ pub(super) struct ConcurrencyLimiter {
}
impl ConcurrencyLimiter {
- pub(super) fn new(sess: &Session, pending_jobs: usize) -> Self {
+ pub(super) fn new(pending_jobs: usize) -> Self {
let state = Arc::new(Mutex::new(state::ConcurrencyLimiterState::new(pending_jobs)));
let available_token_condvar = Arc::new(Condvar::new());
let state_helper = state.clone();
let available_token_condvar_helper = available_token_condvar.clone();
- let helper_thread = sess
- .jobserver
+ let helper_thread = jobserver::client()
.clone()
.into_helper_thread(move |token| {
let mut state = state_helper.lock().unwrap();
@@ -113,7 +111,7 @@ impl Drop for ConcurrencyLimiterToken {
}
mod state {
- use jobserver::Acquired;
+ use rustc_data_structures::jobserver::Acquired;
#[derive(Debug)]
pub(super) struct ConcurrencyLimiterState {
diff --git a/compiler/rustc_codegen_cranelift/src/driver/aot.rs b/compiler/rustc_codegen_cranelift/src/driver/aot.rs
index 5bbcfc2cda7d7..4fc30b69123dd 100644
--- a/compiler/rustc_codegen_cranelift/src/driver/aot.rs
+++ b/compiler/rustc_codegen_cranelift/src/driver/aot.rs
@@ -679,7 +679,7 @@ pub(crate) fn run_aot(
metadata_module: None,
metadata,
crate_info: CrateInfo::new(tcx, target_cpu),
- concurrency_limiter: ConcurrencyLimiter::new(tcx.sess, 0),
+ concurrency_limiter: ConcurrencyLimiter::new(0),
});
};
@@ -711,7 +711,7 @@ pub(crate) fn run_aot(
CguReuse::PreLto | CguReuse::PostLto => false,
});
- let concurrency_limiter = IntoDynSyncSend(ConcurrencyLimiter::new(tcx.sess, todo_cgus.len()));
+ let concurrency_limiter = IntoDynSyncSend(ConcurrencyLimiter::new(todo_cgus.len()));
let modules = tcx.sess.time("codegen mono items", || {
let mut modules: Vec<_> = par_map(todo_cgus, |(_, cgu)| {
diff --git a/compiler/rustc_codegen_cranelift/src/driver/jit.rs b/compiler/rustc_codegen_cranelift/src/driver/jit.rs
index d68948966eaeb..4be4291021dfa 100644
--- a/compiler/rustc_codegen_cranelift/src/driver/jit.rs
+++ b/compiler/rustc_codegen_cranelift/src/driver/jit.rs
@@ -287,12 +287,7 @@ fn dep_symbol_lookup_fn(
let mut dylib_paths = Vec::new();
- let data = &crate_info
- .dependency_formats
- .iter()
- .find(|(crate_type, _data)| *crate_type == rustc_session::config::CrateType::Executable)
- .unwrap()
- .1;
+ let data = &crate_info.dependency_formats[&rustc_session::config::CrateType::Executable].1;
// `used_crates` is in reverse postorder in terms of dependencies. Reverse the order here to
// get a postorder which ensures that all dependencies of a dylib are loaded before the dylib
// itself. This helps the dynamic linker to find dylibs not in the regular dynamic library
diff --git a/compiler/rustc_codegen_cranelift/src/lib.rs b/compiler/rustc_codegen_cranelift/src/lib.rs
index 75f5b32daaa3c..c38ef82e5b80c 100644
--- a/compiler/rustc_codegen_cranelift/src/lib.rs
+++ b/compiler/rustc_codegen_cranelift/src/lib.rs
@@ -12,7 +12,6 @@
#![warn(unused_lifetimes)]
// tidy-alphabetical-end
-extern crate jobserver;
#[macro_use]
extern crate rustc_middle;
extern crate rustc_abi;
diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
index c81e36dfc8d0a..450a95ae20cdd 100644
--- a/compiler/rustc_codegen_ssa/Cargo.toml
+++ b/compiler/rustc_codegen_ssa/Cargo.toml
@@ -11,7 +11,6 @@ bitflags = "2.4.1"
cc = "1.1.23"
either = "1.5.0"
itertools = "0.12"
-jobserver = "0.1.28"
pathdiff = "0.2.0"
regex = "1.4"
rustc_abi = { path = "../rustc_abi" }
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index 35d18d0206dbb..31ac8c6e66aae 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -236,7 +236,13 @@ pub fn each_linked_rlib(
) -> Result<(), errors::LinkRlibError> {
let crates = info.used_crates.iter();
- let fmts = if crate_type.is_none() {
+ let fmts = if let Some(crate_type) = crate_type {
+ let Some(fmts) = info.dependency_formats.get(&crate_type) else {
+ return Err(errors::LinkRlibError::MissingFormat);
+ };
+
+ fmts
+ } else {
for combination in info.dependency_formats.iter().combinations(2) {
let (ty1, list1) = &combination[0];
let (ty2, list2) = &combination[1];
@@ -252,18 +258,7 @@ pub fn each_linked_rlib(
if info.dependency_formats.is_empty() {
return Err(errors::LinkRlibError::MissingFormat);
}
- &info.dependency_formats[0].1
- } else {
- let fmts = info
- .dependency_formats
- .iter()
- .find_map(|&(ty, ref list)| if Some(ty) == crate_type { Some(list) } else { None });
-
- let Some(fmts) = fmts else {
- return Err(errors::LinkRlibError::MissingFormat);
- };
-
- fmts
+ info.dependency_formats.first().unwrap().1
};
for &cnum in crates {
@@ -624,8 +619,7 @@ fn link_staticlib(
let fmts = codegen_results
.crate_info
.dependency_formats
- .iter()
- .find_map(|&(ty, ref list)| if ty == CrateType::Staticlib { Some(list) } else { None })
+ .get(&CrateType::Staticlib)
.expect("no dependency formats for staticlib");
let mut all_rust_dylibs = vec![];
@@ -2355,11 +2349,10 @@ fn linker_with_args(
// they are used within inlined functions or instantiated generic functions. We do this *after*
// handling the raw-dylib symbols in the current crate to make sure that those are chosen first
// by the linker.
- let (_, dependency_linkage) = codegen_results
+ let dependency_linkage = codegen_results
.crate_info
.dependency_formats
- .iter()
- .find(|(ty, _)| *ty == crate_type)
+ .get(&crate_type)
.expect("failed to find crate type in dependency format list");
// We sort the libraries below
@@ -2738,11 +2731,10 @@ fn add_upstream_rust_crates(
// Linking to a rlib involves just passing it to the linker (the linker
// will slurp up the object files inside), and linking to a dynamic library
// involves just passing the right -l flag.
- let (_, data) = codegen_results
+ let data = codegen_results
.crate_info
.dependency_formats
- .iter()
- .find(|(ty, _)| *ty == crate_type)
+ .get(&crate_type)
.expect("failed to find crate type in dependency format list");
if sess.target.is_like_aix {
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs
index 4c5eb98e890e8..301b22f2be4f8 100644
--- a/compiler/rustc_codegen_ssa/src/back/linker.rs
+++ b/compiler/rustc_codegen_ssa/src/back/linker.rs
@@ -1749,7 +1749,7 @@ fn for_each_exported_symbols_include_dep<'tcx>(
}
let formats = tcx.dependency_formats(());
- let deps = formats.iter().find_map(|(t, list)| (*t == crate_type).then_some(list)).unwrap();
+ let deps = &formats[&crate_type];
for (index, dep_format) in deps.iter().enumerate() {
let cnum = CrateNum::new(index + 1);
diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs
index 501f751791936..683defcafee24 100644
--- a/compiler/rustc_codegen_ssa/src/back/write.rs
+++ b/compiler/rustc_codegen_ssa/src/back/write.rs
@@ -6,9 +6,9 @@ use std::sync::Arc;
use std::sync::mpsc::{Receiver, Sender, channel};
use std::{fs, io, mem, str, thread};
-use jobserver::{Acquired, Client};
use rustc_ast::attr;
use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
+use rustc_data_structures::jobserver::{self, Acquired};
use rustc_data_structures::memmap::Mmap;
use rustc_data_structures::profiling::{SelfProfilerRef, VerboseTimingGuard};
use rustc_errors::emitter::Emitter;
@@ -456,7 +456,6 @@ pub(crate) fn start_async_codegen<B: ExtraBackendMethods>(
metadata_module: Option<CompiledModule>,
) -> OngoingCodegen<B> {
let (coordinator_send, coordinator_receive) = channel();
- let sess = tcx.sess;
let crate_attrs = tcx.hir().attrs(rustc_hir::CRATE_HIR_ID);
let no_builtins = attr::contains_name(crate_attrs, sym::no_builtins);
@@ -477,7 +476,6 @@ pub(crate) fn start_async_codegen<B: ExtraBackendMethods>(
shared_emitter,
codegen_worker_send,
coordinator_receive,
- sess.jobserver.clone(),
Arc::new(regular_config),
Arc::new(metadata_config),
Arc::new(allocator_config),
@@ -1093,7 +1091,6 @@ fn start_executing_work<B: ExtraBackendMethods>(
shared_emitter: SharedEmitter,
codegen_worker_send: Sender<CguMessage>,
coordinator_receive: Receiver<Box<dyn Any + Send>>,
- jobserver: Client,
regular_config: Arc<ModuleConfig>,
metadata_config: Arc<ModuleConfig>,
allocator_config: Arc<ModuleConfig>,
@@ -1145,7 +1142,7 @@ fn start_executing_work<B: ExtraBackendMethods>(
// get tokens on `coordinator_receive` which will
// get managed in the main loop below.
let coordinator_send2 = coordinator_send.clone();
- let helper = jobserver
+ let helper = jobserver::client()
.into_helper_thread(move |token| {
drop(coordinator_send2.send(Box::new(Message::Token::<B>(token))));
})
diff --git a/compiler/rustc_data_structures/src/jobserver.rs b/compiler/rustc_data_structures/src/jobserver.rs
index d09f7efc8ffff..1204f2d692d6c 100644
--- a/compiler/rustc_data_structures/src/jobserver.rs
+++ b/compiler/rustc_data_structures/src/jobserver.rs
@@ -1,6 +1,6 @@
use std::sync::{LazyLock, OnceLock};
-pub use jobserver_crate::Client;
+pub use jobserver_crate::{Acquired, Client, HelperThread};
use jobserver_crate::{FromEnv, FromEnvErrorKind};
// We can only call `from_env_ext` once per process
diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs
index fe4e822ce0d22..b80736f41ada1 100644
--- a/compiler/rustc_driver_impl/src/lib.rs
+++ b/compiler/rustc_driver_impl/src/lib.rs
@@ -347,6 +347,8 @@ fn run_compiler(
callbacks.config(&mut config);
+ let registered_lints = config.register_lints.is_some();
+
interface::run_compiler(config, |compiler| {
let sess = &compiler.sess;
let codegen_backend = &*compiler.codegen_backend;
@@ -362,7 +364,7 @@ fn run_compiler(
// `--help`/`-Zhelp`/`-Chelp`. This is the earliest it can run, because
// it must happen after lints are registered, during session creation.
if sess.opts.describe_lints {
- describe_lints(sess);
+ describe_lints(sess, registered_lints);
return early_exit();
}
@@ -980,7 +982,7 @@ the command line flag directly.
}
/// Write to stdout lint command options, together with a list of all available lints
-pub fn describe_lints(sess: &Session) {
+pub fn describe_lints(sess: &Session, registered_lints: bool) {
safe_println!(
"
Available lint options:
@@ -1084,7 +1086,7 @@ Available lint options:
print_lint_groups(builtin_groups, true);
- match (sess.registered_lints, loaded.len(), loaded_groups.len()) {
+ match (registered_lints, loaded.len(), loaded_groups.len()) {
(false, 0, _) | (false, _, 0) => {
safe_println!("Lint tools like Clippy can load additional lints and lint groups.");
}
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs
index 1b6c6edcc614f..ac2f91cdeb3fe 100644
--- a/compiler/rustc_errors/src/emitter.rs
+++ b/compiler/rustc_errors/src/emitter.rs
@@ -3048,11 +3048,19 @@ impl FileWithAnnotatedLines {
// working correctly.
let middle = min(ann.line_start + 4, ann.line_end);
// We'll show up to 4 lines past the beginning of the multispan start.
- // We will *not* include the tail of lines that are only whitespace.
+ // We will *not* include the tail of lines that are only whitespace, a comment or
+ // a bare delimiter.
+ let filter = |s: &str| {
+ let s = s.trim();
+ // Consider comments as empty, but don't consider docstrings to be empty.
+ !(s.starts_with("//") && !(s.starts_with("///") || s.starts_with("//!")))
+ // Consider lines with nothing but whitespace, a single delimiter as empty.
+ && !["", "{", "}", "(", ")", "[", "]"].contains(&s)
+ };
let until = (ann.line_start..middle)
.rev()
.filter_map(|line| file.get_line(line - 1).map(|s| (line + 1, s)))
- .find(|(_, s)| !s.trim().is_empty())
+ .find(|(_, s)| filter(s))
.map(|(line, _)| line)
.unwrap_or(ann.line_start);
for line in ann.line_start + 1..until {
@@ -3060,7 +3068,8 @@ impl FileWithAnnotatedLines {
add_annotation_to_file(&mut output, Lrc::clone(&file), line, ann.as_line());
}
let line_end = ann.line_end - 1;
- if middle < line_end {
+ let end_is_empty = file.get_line(line_end - 1).map_or(false, |s| !filter(&s));
+ if middle < line_end && !end_is_empty {
add_annotation_to_file(&mut output, Lrc::clone(&file), line_end, ann.as_line());
}
} else {
diff --git a/compiler/rustc_hir_analysis/src/collect.rs b/compiler/rustc_hir_analysis/src/collect.rs
index debfe6af0fbf9..cb5086c9a659f 100644
--- a/compiler/rustc_hir_analysis/src/collect.rs
+++ b/compiler/rustc_hir_analysis/src/collect.rs
@@ -201,12 +201,13 @@ pub(crate) fn placeholder_type_error_diag<'cx, 'tcx>(
placeholder_types.iter().map(|sp| (*sp, (*type_name).to_string())).collect();
if let Some(generics) = generics {
- if let Some(arg) = params.iter().find(|arg| {
- matches!(arg.name, hir::ParamName::Plain(Ident { name: kw::Underscore, .. }))
+ if let Some(span) = params.iter().find_map(|arg| match arg.name {
+ hir::ParamName::Plain(Ident { name: kw::Underscore, span }) => Some(span),
+ _ => None,
}) {
// Account for `_` already present in cases like `struct S<_>(_);` and suggest
// `struct S<T>(T);` instead of `struct S<_, T>(T);`.
- sugg.push((arg.span, (*type_name).to_string()));
+ sugg.push((span, (*type_name).to_string()));
} else if let Some(span) = generics.span_for_param_suggestion() {
// Account for bounds, we want `fn foo<T: E, K>(_: K)` not `fn foo<T, K: E>(_: K)`.
sugg.push((span, format!(", {type_name}")));
diff --git a/compiler/rustc_interface/src/interface.rs b/compiler/rustc_interface/src/interface.rs
index 07ae24ee6d32b..91f190c6a28de 100644
--- a/compiler/rustc_interface/src/interface.rs
+++ b/compiler/rustc_interface/src/interface.rs
@@ -371,7 +371,6 @@ pub(crate) fn initialize_checked_jobserver(early_dcx: &EarlyDiagCtxt) {
// JUSTIFICATION: before session exists, only config
#[allow(rustc::bad_opt_access)]
-#[allow(rustc::untranslatable_diagnostic)] // FIXME: make this translatable
pub fn run_compiler<R: Send>(config: Config, f: impl FnOnce(&Compiler) -> R + Send) -> R {
trace!("run_compiler");
@@ -425,7 +424,11 @@ pub fn run_compiler<R: Send>(config: Config, f: impl FnOnce(&Compiler) -> R + Se
config.opts.unstable_opts.translate_directionality_markers,
) {
Ok(bundle) => bundle,
- Err(e) => early_dcx.early_fatal(format!("failed to load fluent bundle: {e}")),
+ Err(e) => {
+ // We can't translate anything if we failed to load translations
+ #[allow(rustc::untranslatable_diagnostic)]
+ early_dcx.early_fatal(format!("failed to load fluent bundle: {e}"))
+ }
};
let mut locale_resources = config.locale_resources;
@@ -479,7 +482,6 @@ pub fn run_compiler<R: Send>(config: Config, f: impl FnOnce(&Compiler) -> R + Se
let mut lint_store = rustc_lint::new_lint_store(sess.enable_internal_lints());
if let Some(register_lints) = config.register_lints.as_deref() {
register_lints(&sess, &mut lint_store);
- sess.registered_lints = true;
}
sess.lint_store = Some(Lrc::new(lint_store));
diff --git a/compiler/rustc_metadata/src/dependency_format.rs b/compiler/rustc_metadata/src/dependency_format.rs
index 641d1d8e79819..e8de0acb7c9fe 100644
--- a/compiler/rustc_metadata/src/dependency_format.rs
+++ b/compiler/rustc_metadata/src/dependency_format.rs
@@ -77,7 +77,7 @@ pub(crate) fn calculate(tcx: TyCtxt<'_>) -> Dependencies {
verify_ok(tcx, &linkage);
(ty, linkage)
})
- .collect::<Vec<_>>()
+ .collect()
}
fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList {
diff --git a/compiler/rustc_metadata/src/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs
index e67db5d347836..df5b06c6d16f6 100644
--- a/compiler/rustc_metadata/src/rmeta/encoder.rs
+++ b/compiler/rustc_metadata/src/rmeta/encoder.rs
@@ -2161,10 +2161,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
fn encode_dylib_dependency_formats(&mut self) -> LazyArray<Option<LinkagePreference>> {
empty_proc_macro!(self);
let formats = self.tcx.dependency_formats(());
- for (ty, arr) in formats.iter() {
- if *ty != CrateType::Dylib {
- continue;
- }
+ if let Some(arr) = formats.get(&CrateType::Dylib) {
return self.lazy_array(arr.iter().map(|slot| match *slot {
Linkage::NotLinked | Linkage::IncludedFromDylib => None,
diff --git a/compiler/rustc_middle/src/middle/dependency_format.rs b/compiler/rustc_middle/src/middle/dependency_format.rs
index a3aff9a110130..e3b40b6415784 100644
--- a/compiler/rustc_middle/src/middle/dependency_format.rs
+++ b/compiler/rustc_middle/src/middle/dependency_format.rs
@@ -7,6 +7,7 @@
// FIXME: move this file to rustc_metadata::dependency_format, but
// this will introduce circular dependency between rustc_metadata and rustc_middle
+use rustc_data_structures::fx::FxIndexMap;
use rustc_macros::{Decodable, Encodable, HashStable};
use rustc_session::config::CrateType;
@@ -18,7 +19,7 @@ pub type DependencyList = Vec<Linkage>;
/// A mapping of all required dependencies for a particular flavor of output.
///
/// This is local to the tcx, and is generally relevant to one session.
-pub type Dependencies = Vec<(CrateType, DependencyList)>;
+pub type Dependencies = FxIndexMap<CrateType, DependencyList>;
#[derive(Copy, Clone, PartialEq, Debug, HashStable, Encodable, Decodable)]
pub enum Linkage {
diff --git a/compiler/rustc_middle/src/mir/mono.rs b/compiler/rustc_middle/src/mir/mono.rs
index 1f50b67cb50d5..266dc7ad2b3b2 100644
--- a/compiler/rustc_middle/src/mir/mono.rs
+++ b/compiler/rustc_middle/src/mir/mono.rs
@@ -294,10 +294,22 @@ pub enum Linkage {
Common,
}
+/// Specifies the symbol visibility with regards to dynamic linking.
+///
+/// Visibility doesn't have any effect when linkage is internal.
+///
+/// DSO means dynamic shared object, that is a dynamically linked executable or dylib.
#[derive(Copy, Clone, PartialEq, Debug, HashStable)]
pub enum Visibility {
+ /// Export the symbol from the DSO and apply overrides of the symbol by outside DSOs to within
+ /// the DSO if the object file format supports this.
Default,
+ /// Hide the symbol outside of the defining DSO even when external linkage is used to export it
+ /// from the object file.
Hidden,
+ /// Export the symbol from the DSO, but don't apply overrides of the symbol by outside DSOs to
+ /// within the DSO. Equivalent to default visibility with object file formats that don't support
+ /// overriding exported symbols by another DSO.
Protected,
}
diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
index 993d111466bed..9f6106f9cfb7e 100644
--- a/compiler/rustc_session/src/session.rs
+++ b/compiler/rustc_session/src/session.rs
@@ -8,7 +8,6 @@ use std::{env, fmt, io};
use rustc_data_structures::flock;
use rustc_data_structures::fx::{FxHashMap, FxIndexSet};
-use rustc_data_structures::jobserver::{self, Client};
use rustc_data_structures::profiling::{SelfProfiler, SelfProfilerRef};
use rustc_data_structures::sync::{
DynSend, DynSync, Lock, Lrc, MappedReadGuard, ReadGuard, RwLock,
@@ -154,16 +153,9 @@ pub struct Session {
/// Data about code being compiled, gathered during compilation.
pub code_stats: CodeStats,
- /// Loaded up early on in the initialization of this `Session` to avoid
- /// false positives about a job server in our environment.
- pub jobserver: Client,
-
/// This only ever stores a `LintStore` but we don't want a dependency on that type here.
pub lint_store: Option<Lrc<dyn LintStoreMarker>>,
- /// Should be set if any lints are registered in `lint_store`.
- pub registered_lints: bool,
-
/// Cap lint level specified by a driver specifically.
pub driver_lint_caps: FxHashMap<lint::LintId, lint::Level>,
@@ -1072,9 +1064,7 @@ pub fn build_session(
incr_comp_session: RwLock::new(IncrCompSession::NotInitialized),
prof,
code_stats: Default::default(),
- jobserver: jobserver::client(),
lint_store: None,
- registered_lints: false,
driver_lint_caps,
ctfe_backtrace,
miri_unleashed_features: Lock::new(Default::default()),
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 0c739115165ec..89b2d73f74a81 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -471,7 +471,7 @@ impl Step for Rustc {
}
}
- {
+ if builder.config.llvm_enabled(compiler.host) && builder.config.llvm_tools_enabled {
let src_dir = builder.sysroot_target_bindir(compiler, host);
let llvm_objcopy = exe("llvm-objcopy", compiler.host);
let rust_objcopy = exe("rust-objcopy", compiler.host);
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index c6800aedca971..22d361ff091cb 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -1320,7 +1320,31 @@ impl Config {
// Set flags.
config.paths = std::mem::take(&mut flags.paths);
- config.skip = flags.skip.into_iter().chain(flags.exclude).collect();
+ config.skip = flags
+ .skip
+ .into_iter()
+ .chain(flags.exclude)
+ .map(|p| {
+ let p = if cfg!(windows) {
+ PathBuf::from(p.to_str().unwrap().replace('/', "\\"))
+ } else {
+ p
+ };
+
+ // Jump to top-level project path to support passing paths
+ // from sub directories.
+ let top_level_path = config.src.join(&p);
+ if !config.src.join(&top_level_path).exists() {
+ eprintln!("WARNING: '{}' does not exist.", top_level_path.display());
+ }
+
+ // Never return top-level path here as it would break `--skip`
+ // logic on rustc's internal test framework which is utilized
+ // by compiletest.
+ p
+ })
+ .collect();
+
config.include_default_paths = flags.include_default_paths;
config.rustc_error_format = flags.rustc_error_format;
config.json_output = flags.json_output;
diff --git a/src/librustdoc/html/render/search_index.rs b/src/librustdoc/html/render/search_index.rs
index 91b31f31ab192..2c26ffa76f6a8 100644
--- a/src/librustdoc/html/render/search_index.rs
+++ b/src/librustdoc/html/render/search_index.rs
@@ -423,6 +423,14 @@ pub(crate) fn build_index(
}
Some(path)
});
+ } else if let Some(parent_idx) = item.parent_idx {
+ let i = <isize as TryInto<usize>>::try_into(parent_idx).unwrap();
+ item.path = {
+ let p = &crate_paths[i].1;
+ join_with_double_colon(&p[..p.len() - 1])
+ };
+ item.exact_path =
+ crate_paths[i].2.as_ref().map(|xp| join_with_double_colon(&xp[..xp.len() - 1]));
}
// Omit the parent path if it is same to that of the prior item.
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index a384c286039d2..5d82b8e309a6a 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -846,11 +846,13 @@ fn main_args(
let config = core::create_config(input, options, &render_options, using_internal_features);
+ let registered_lints = config.register_lints.is_some();
+
interface::run_compiler(config, |compiler| {
let sess = &compiler.sess;
if sess.opts.describe_lints {
- rustc_driver::describe_lints(sess);
+ rustc_driver::describe_lints(sess, registered_lints);
return;
}
diff --git a/src/tools/clippy/tests/ui-toml/arbitrary_source_item_ordering/ordering_mixed.default.stderr b/src/tools/clippy/tests/ui-toml/arbitrary_source_item_ordering/ordering_mixed.default.stderr
index 062bf25ea624c..ee2868869deb5 100644
--- a/src/tools/clippy/tests/ui-toml/arbitrary_source_item_ordering/ordering_mixed.default.stderr
+++ b/src/tools/clippy/tests/ui-toml/arbitrary_source_item_ordering/ordering_mixed.default.stderr
@@ -20,7 +20,6 @@ LL | | fn clone_self(&self) -> Self {
LL | | Self {
LL | | a: true,
... |
-LL | | }
LL | | }
| |_^
|
@@ -32,7 +31,6 @@ LL | | fn default() -> Self {
LL | | Self {
LL | | a: true,
... |
-LL | | }
LL | | }
| |_^
diff --git a/src/tools/clippy/tests/ui-toml/excessive_nesting/excessive_nesting.stderr b/src/tools/clippy/tests/ui-toml/excessive_nesting/excessive_nesting.stderr
index ccdaecdd48170..9cf6fc66757d0 100644
--- a/src/tools/clippy/tests/ui-toml/excessive_nesting/excessive_nesting.stderr
+++ b/src/tools/clippy/tests/ui-toml/excessive_nesting/excessive_nesting.stderr
@@ -66,8 +66,7 @@ error: this block is too nested
LL | if true {
| _________________________^
LL | | if true {
-LL | |
-LL | | }
+... |
LL | | }
| |_________________^
|
diff --git a/src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr b/src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr
index a44c810b13502..9677beeb2c24a 100644
--- a/src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr
+++ b/src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr
@@ -286,7 +286,6 @@ LL | | if unsafe { true } {
LL | | todo!();
LL | | } else {
... |
-LL | | }
LL | | };
| |______^
|
diff --git a/src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr b/src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr
index db5ea5b628902..0eccdd4280086 100644
--- a/src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr
+++ b/src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr
@@ -294,7 +294,6 @@ LL | | if unsafe { true } {
LL | | todo!();
LL | | } else {
... |
-LL | | }
LL | | };
| |______^
|
diff --git a/src/tools/clippy/tests/ui/async_yields_async.stderr b/src/tools/clippy/tests/ui/async_yields_async.stderr
index c900a9d742164..474914299d069 100644
--- a/src/tools/clippy/tests/ui/async_yields_async.stderr
+++ b/src/tools/clippy/tests/ui/async_yields_async.stderr
@@ -80,7 +80,6 @@ error: an async construct yields a type which is itself awaitable
LL | let _m = async || {
| _______________________-
LL | | println!("I'm bored");
-LL | | // Some more stuff
... |
LL | | CustomFutureType
| | ^^^^^^^^^^^^^^^^
diff --git a/src/tools/clippy/tests/ui/bind_instead_of_map_multipart.stderr b/src/tools/clippy/tests/ui/bind_instead_of_map_multipart.stderr
index 2adaecc96d6a9..d271381adea2a 100644
--- a/src/tools/clippy/tests/ui/bind_instead_of_map_multipart.stderr
+++ b/src/tools/clippy/tests/ui/bind_instead_of_map_multipart.stderr
@@ -44,7 +44,6 @@ LL | | if {
LL | | if s == "43" {
LL | | return Some(43);
... |
-LL | | }
LL | | });
| |______^
|
diff --git a/src/tools/clippy/tests/ui/branches_sharing_code/shared_at_bottom.stderr b/src/tools/clippy/tests/ui/branches_sharing_code/shared_at_bottom.stderr
index 68ebb6ad7811a..36b1777397320 100644
--- a/src/tools/clippy/tests/ui/branches_sharing_code/shared_at_bottom.stderr
+++ b/src/tools/clippy/tests/ui/branches_sharing_code/shared_at_bottom.stderr
@@ -115,8 +115,7 @@ error: all if blocks contain the same code at the end
--> tests/ui/branches_sharing_code/shared_at_bottom.rs:183:5
|
LL | / x << 2
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -131,8 +130,7 @@ error: all if blocks contain the same code at the end
--> tests/ui/branches_sharing_code/shared_at_bottom.rs:192:5
|
LL | / x * 4
-LL | |
-LL | |
+... |
LL | | }
| |_____^
|
diff --git a/src/tools/clippy/tests/ui/collapsible_else_if.stderr b/src/tools/clippy/tests/ui/collapsible_else_if.stderr
index 395c2dcf68dc0..45566a78bd81d 100644
--- a/src/tools/clippy/tests/ui/collapsible_else_if.stderr
+++ b/src/tools/clippy/tests/ui/collapsible_else_if.stderr
@@ -43,9 +43,7 @@ LL | } else {
| ____________^
LL | | if y == "world" {
LL | | println!("world")
-LL | | }
... |
-LL | | }
LL | | }
| |_____^
|
@@ -66,9 +64,7 @@ LL | } else {
| ____________^
LL | | if let Some(42) = Some(42) {
LL | | println!("world")
-LL | | }
... |
-LL | | }
LL | | }
| |_____^
|
@@ -89,9 +85,7 @@ LL | } else {
| ____________^
LL | | if let Some(42) = Some(42) {
LL | | println!("world")
-LL | | }
... |
-LL | | }
LL | | }
| |_____^
|
@@ -112,9 +106,7 @@ LL | } else {
| ____________^
LL | | if x == "hello" {
LL | | println!("world")
-LL | | }
... |
-LL | | }
LL | | }
| |_____^
|
@@ -135,9 +127,7 @@ LL | } else {
| ____________^
LL | | if let Some(42) = Some(42) {
LL | | println!("world")
-LL | | }
... |
-LL | | }
LL | | }
| |_____^
|
diff --git a/src/tools/clippy/tests/ui/copy_iterator.stderr b/src/tools/clippy/tests/ui/copy_iterator.stderr
index 990b1ce628dec..2f6378a85feea 100644
--- a/src/tools/clippy/tests/ui/copy_iterator.stderr
+++ b/src/tools/clippy/tests/ui/copy_iterator.stderr
@@ -6,7 +6,6 @@ LL | |
LL | |
LL | | type Item = u8;
... |
-LL | | }
LL | | }
| |_^
|
diff --git a/src/tools/clippy/tests/ui/crashes/ice-360.stderr b/src/tools/clippy/tests/ui/crashes/ice-360.stderr
index 50b245c65cde5..9961eb21485da 100644
--- a/src/tools/clippy/tests/ui/crashes/ice-360.stderr
+++ b/src/tools/clippy/tests/ui/crashes/ice-360.stderr
@@ -2,11 +2,7 @@ error: this loop never actually loops
--> tests/ui/crashes/ice-360.rs:5:5
|
LL | / loop {
-LL | |
-LL | |
-LL | |
... |
-LL | |
LL | | }
| |_____^
|
@@ -16,11 +12,7 @@ error: this loop could be written as a `while let` loop
--> tests/ui/crashes/ice-360.rs:5:5
|
LL | / loop {
-LL | |
-LL | |
-LL | |
... |
-LL | |
LL | | }
| |_____^ help: try: `while let Some(ele) = iter.next() { .. }`
|
diff --git a/src/tools/clippy/tests/ui/crate_level_checks/no_std_swap.stderr b/src/tools/clippy/tests/ui/crate_level_checks/no_std_swap.stderr
index 7d7922ae8cac7..bcc8684f7c2bd 100644
--- a/src/tools/clippy/tests/ui/crate_level_checks/no_std_swap.stderr
+++ b/src/tools/clippy/tests/ui/crate_level_checks/no_std_swap.stderr
@@ -2,8 +2,7 @@ error: this looks like you are trying to swap `a` and `b`
--> tests/ui/crate_level_checks/no_std_swap.rs:12:5
|
LL | / a = b;
-LL | |
-LL | |
+... |
LL | | b = a;
| |_________^ help: try: `core::mem::swap(&mut a, &mut b)`
|
diff --git a/src/tools/clippy/tests/ui/derivable_impls.stderr b/src/tools/clippy/tests/ui/derivable_impls.stderr
index c22569145bdb2..0caea892358a0 100644
--- a/src/tools/clippy/tests/ui/derivable_impls.stderr
+++ b/src/tools/clippy/tests/ui/derivable_impls.stderr
@@ -6,7 +6,6 @@ LL | | fn default() -> Self {
LL | | Self {
LL | | a: false,
... |
-LL | | }
LL | | }
| |_^
|
diff --git a/src/tools/clippy/tests/ui/empty_line_after/doc_comments.stderr b/src/tools/clippy/tests/ui/empty_line_after/doc_comments.stderr
index 2852e26680f65..c5d5f3d375947 100644
--- a/src/tools/clippy/tests/ui/empty_line_after/doc_comments.stderr
+++ b/src/tools/clippy/tests/ui/empty_line_after/doc_comments.stderr
@@ -99,8 +99,7 @@ LL | / /// for OldA
LL | | // struct OldA;
LL | |
LL | | /// Docs
-LL | | /// for OldB
-LL | | // struct OldB;
+... |
LL | |
| |_^
...
diff --git a/src/tools/clippy/tests/ui/empty_line_after/outer_attribute.stderr b/src/tools/clippy/tests/ui/empty_line_after/outer_attribute.stderr
index 75fc23e9e7ebd..a95306e2fa335 100644
--- a/src/tools/clippy/tests/ui/empty_line_after/outer_attribute.stderr
+++ b/src/tools/clippy/tests/ui/empty_line_after/outer_attribute.stderr
@@ -103,8 +103,7 @@ error: empty lines after outer attribute
--> tests/ui/empty_line_after/outer_attribute.rs:64:1
|
LL | / #[allow(unused)]
-LL | |
-LL | | // This comment is isolated
+... |
LL | |
| |_^
LL | pub fn isolated_comment() {}
diff --git a/src/tools/clippy/tests/ui/entry.stderr b/src/tools/clippy/tests/ui/entry.stderr
index fb4676766066a..4b6bd3b4a2587 100644
--- a/src/tools/clippy/tests/ui/entry.stderr
+++ b/src/tools/clippy/tests/ui/entry.stderr
@@ -16,8 +16,7 @@ LL | / if !m.contains_key(&k) {
LL | | if true {
LL | | m.insert(k, v);
LL | | } else {
-LL | | m.insert(k, v2);
-LL | | }
+... |
LL | | }
| |_____^
|
@@ -63,7 +62,6 @@ LL | | if true {
LL | | m.insert(k, v);
LL | | } else {
... |
-LL | | }
LL | | }
| |_____^
|
@@ -154,7 +152,6 @@ LL | | foo();
LL | | match 0 {
LL | | 0 if false => {
... |
-LL | | }
LL | | }
| |_____^
|
diff --git a/src/tools/clippy/tests/ui/enum_variants.stderr b/src/tools/clippy/tests/ui/enum_variants.stderr
index aaac3cbb82dc1..ecca6c833ac55 100644
--- a/src/tools/clippy/tests/ui/enum_variants.stderr
+++ b/src/tools/clippy/tests/ui/enum_variants.stderr
@@ -13,7 +13,6 @@ error: all variants have the same prefix: `c`
LL | / enum Foo {
LL | |
LL | | cFoo,
-LL | |
... |
LL | | cBaz,
LL | | }
@@ -45,9 +44,7 @@ error: all variants have the same prefix: `Food`
LL | / enum Food {
LL | |
LL | | FoodGood,
-LL | |
... |
-LL | |
LL | | }
| |_^
|
diff --git a/src/tools/clippy/tests/ui/fallible_impl_from.stderr b/src/tools/clippy/tests/ui/fallible_impl_from.stderr
index 62496148924e1..cc3739031b76e 100644
--- a/src/tools/clippy/tests/ui/fallible_impl_from.stderr
+++ b/src/tools/clippy/tests/ui/fallible_impl_from.stderr
@@ -29,7 +29,6 @@ LL | |
LL | | fn from(i: usize) -> Invalid {
LL | | if i != 42 {
... |
-LL | | }
LL | | }
| |_^
|
@@ -49,7 +48,6 @@ LL | |
LL | | fn from(s: Option<String>) -> Invalid {
LL | | let s = s.unwrap();
... |
-LL | | }
LL | | }
| |_^
|
@@ -76,7 +74,6 @@ LL | |
LL | | fn from(s: &'a mut <Box<u32> as ProjStrTrait>::ProjString) -> Invalid {
LL | | if s.parse::<u32>().ok().unwrap() != 42 {
... |
-LL | | }
LL | | }
| |_^
|
diff --git a/src/tools/clippy/tests/ui/if_same_then_else2.stderr b/src/tools/clippy/tests/ui/if_same_then_else2.stderr
index 93507eb2c6fde..369d6f6673722 100644
--- a/src/tools/clippy/tests/ui/if_same_then_else2.stderr
+++ b/src/tools/clippy/tests/ui/if_same_then_else2.stderr
@@ -7,7 +7,6 @@ LL | | for _ in &[42] {
LL | | let foo: &Option<_> = &Some::<u8>(42);
LL | | if foo.is_some() {
... |
-LL | | }
LL | | } else {
| |_____^
|
@@ -20,7 +19,6 @@ LL | | for _ in &[42] {
LL | | let bar: &Option<_> = &Some::<u8>(42);
LL | | if bar.is_some() {
... |
-LL | | }
LL | | }
| |_____^
= note: `-D clippy::if-same-then-else` implied by `-D warnings`
diff --git a/src/tools/clippy/tests/ui/infinite_loops.stderr b/src/tools/clippy/tests/ui/infinite_loops.stderr
index 7635a7442f4a2..3b5705d5f21da 100644
--- a/src/tools/clippy/tests/ui/infinite_loops.stderr
+++ b/src/tools/clippy/tests/ui/infinite_loops.stderr
@@ -20,7 +20,6 @@ error: infinite loop detected
LL | / loop {
LL | |
LL | | loop {
-LL | |
... |
LL | | do_something();
LL | | }
@@ -37,9 +36,7 @@ error: infinite loop detected
LL | / loop {
LL | |
LL | | loop {
-LL | |
-LL | | do_something();
-LL | | }
+... |
LL | | }
| |_________^
|
@@ -79,8 +76,7 @@ error: infinite loop detected
LL | / loop {
LL | | fn inner_fn() -> ! {
LL | | std::process::exit(0);
-LL | | }
-LL | | do_something();
+... |
LL | | }
| |_____^
|
@@ -97,7 +93,6 @@ LL | |
LL | | loop {
LL | | if cond {
... |
-LL | | }
LL | | }
| |_____^
|
@@ -114,7 +109,6 @@ LL | |
LL | | 'inner: loop {
LL | | loop {
... |
-LL | | }
LL | | }
| |_____^
|
@@ -145,7 +139,6 @@ LL | |
LL | | 'inner: loop {
LL | | loop {
... |
-LL | | }
LL | | }
| |_________^
|
@@ -162,7 +155,6 @@ LL | |
LL | | match opt {
LL | | Some(v) => {
... |
-LL | | }
LL | | }
| |_____^
|
@@ -279,7 +271,6 @@ LL | |
LL | | 'inner: loop {
LL | | loop {
... |
-LL | | }
LL | | }
| |_____^
|
diff --git a/src/tools/clippy/tests/ui/into_iter_without_iter.stderr b/src/tools/clippy/tests/ui/into_iter_without_iter.stderr
index 533a7f6859354..cde1b60c2abcf 100644
--- a/src/tools/clippy/tests/ui/into_iter_without_iter.stderr
+++ b/src/tools/clippy/tests/ui/into_iter_without_iter.stderr
@@ -6,7 +6,6 @@ LL | |
LL | | type IntoIter = std::slice::Iter<'a, u8>;
LL | | type Item = &'a u8;
... |
-LL | | }
LL | | }
| |_^
|
@@ -30,7 +29,6 @@ LL | |
LL | | type IntoIter = std::slice::IterMut<'a, u8>;
LL | | type Item = &'a mut u8;
... |
-LL | | }
LL | | }
| |_^
|
@@ -52,7 +50,6 @@ LL | |
LL | | type IntoIter = std::slice::Iter<'a, T>;
LL | | type Item = &'a T;
... |
-LL | | }
LL | | }
| |_^
|
@@ -74,7 +71,6 @@ LL | |
LL | | type IntoIter = std::slice::IterMut<'a, T>;
LL | | type Item = &'a mut T;
... |
-LL | | }
LL | | }
| |_^
|
@@ -96,7 +92,6 @@ LL | |
LL | | type IntoIter = std::slice::IterMut<'a, T>;
LL | | type Item = &'a mut T;
... |
-LL | | }
LL | | }
| |_^
|
@@ -117,8 +112,7 @@ LL | / impl<'a> IntoIterator for &'a Issue12037 {
LL | | type IntoIter = std::slice::Iter<'a, u8>;
LL | | type Item = &'a u8;
LL | | fn into_iter(self) -> Self::IntoIter {
-LL | | todo!()
-LL | | }
+... |
LL | | }
| |_________^
...
diff --git a/src/tools/clippy/tests/ui/manual_find.stderr b/src/tools/clippy/tests/ui/manual_find.stderr
index eb55a0c11f244..a4e7878a247c1 100644
--- a/src/tools/clippy/tests/ui/manual_find.stderr
+++ b/src/tools/clippy/tests/ui/manual_find.stderr
@@ -6,7 +6,6 @@ LL | |
LL | |
LL | | if s == String::new() {
... |
-LL | | }
LL | | None
| |________^ help: replace with an iterator: `strings.into_iter().find(|s| s == String::new())`
|
@@ -22,7 +21,6 @@ LL | |
LL | |
LL | | if s == String::new() {
... |
-LL | | }
LL | | None
| |________^ help: replace with an iterator: `arr.into_iter().map(|(s, _)| s).find(|s| s == String::new())`
|
diff --git a/src/tools/clippy/tests/ui/manual_find_fixable.stderr b/src/tools/clippy/tests/ui/manual_find_fixable.stderr
index c3f48fb9f98a3..5ed8be1b3eeda 100644
--- a/src/tools/clippy/tests/ui/manual_find_fixable.stderr
+++ b/src/tools/clippy/tests/ui/manual_find_fixable.stderr
@@ -4,8 +4,7 @@ error: manual implementation of `Iterator::find`
LL | / for &v in ARRAY {
LL | | if v == n {
LL | | return Some(v);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `ARRAY.iter().find(|&&v| v == n).copied()`
|
@@ -18,8 +17,7 @@ error: manual implementation of `Iterator::find`
LL | / for (a, _) in arr {
LL | | if a % 2 == 0 {
LL | | return Some(a);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `arr.into_iter().map(|(a, _)| a).find(|&a| a % 2 == 0)`
@@ -29,8 +27,7 @@ error: manual implementation of `Iterator::find`
LL | / for el in arr {
LL | | if el.name.len() == 10 {
LL | | return Some(el);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `arr.into_iter().find(|el| el.name.len() == 10)`
|
@@ -42,8 +39,7 @@ error: manual implementation of `Iterator::find`
LL | / for Tuple(a, _) in arr {
LL | | if a >= 3 {
LL | | return Some(a);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `arr.into_iter().map(|Tuple(a, _)| a).find(|&a| a >= 3)`
@@ -53,8 +49,7 @@ error: manual implementation of `Iterator::find`
LL | / for el in arr {
LL | | if el.should_keep() {
LL | | return Some(el);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `arr.into_iter().find(|el| el.should_keep())`
|
@@ -66,8 +61,7 @@ error: manual implementation of `Iterator::find`
LL | / for el in arr {
LL | | if f(el) == 20 {
LL | | return Some(el);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `arr.into_iter().find(|&el| f(el) == 20)`
@@ -77,8 +71,7 @@ error: manual implementation of `Iterator::find`
LL | / for &el in arr.values() {
LL | | if f(el) {
LL | | return Some(el);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `arr.values().find(|&&el| f(el)).copied()`
@@ -88,8 +81,7 @@ error: manual implementation of `Iterator::find`
LL | / for el in arr {
LL | | if el.is_true {
LL | | return Some(el);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `arr.into_iter().find(|el| el.is_true)`
|
@@ -101,8 +93,7 @@ error: manual implementation of `Iterator::find`
LL | / for (_, &x) in v {
LL | | if x > 10 {
LL | | return Some(x);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `v.into_iter().map(|(_, &x)| x).find(|&x| x > 10)`
@@ -112,8 +103,7 @@ error: manual implementation of `Iterator::find`
LL | / for &(_, &x) in v {
LL | | if x > 10 {
LL | | return Some(x);
-LL | | }
-LL | | }
+... |
LL | | None
| |________^ help: replace with an iterator: `v.iter().map(|&(_, &x)| x).find(|&x| x > 10)`
@@ -123,8 +113,7 @@ error: manual implementation of `Iterator::find`
LL | / for x in arr {
LL | | if x >= 5 {
LL | | return Some(x);
-LL | | }
-LL | | }
+... |
LL | | return None;
| |________________^ help: replace with an iterator: `arr.into_iter().find(|&x| x >= 5)`
@@ -134,8 +123,7 @@ error: manual implementation of `Iterator::find`
LL | / for x in arr {
LL | | if x < 1 {
LL | | return Some(x);
-LL | | }
-LL | | }
+... |
LL | | None
| |____________^ help: replace with an iterator: `arr.into_iter().find(|&x| x < 1)`
diff --git a/src/tools/clippy/tests/ui/manual_flatten.stderr b/src/tools/clippy/tests/ui/manual_flatten.stderr
index 3b64d9ef859d6..cf1b0a1c8bbf6 100644
--- a/src/tools/clippy/tests/ui/manual_flatten.stderr
+++ b/src/tools/clippy/tests/ui/manual_flatten.stderr
@@ -184,7 +184,6 @@ LL | |
LL | | Some(1),
LL | | Some(2),
... |
-LL | | }
LL | | }
| |_____^
|
diff --git a/src/tools/clippy/tests/ui/manual_let_else.stderr b/src/tools/clippy/tests/ui/manual_let_else.stderr
index 55a410982adfd..dcd5d4561113b 100644
--- a/src/tools/clippy/tests/ui/manual_let_else.stderr
+++ b/src/tools/clippy/tests/ui/manual_let_else.stderr
@@ -148,7 +148,6 @@ LL | |
LL | | v_some
LL | | } else {
... |
-LL | | }
LL | | };
| |______^
|
@@ -175,7 +174,6 @@ LL | |
LL | | v_some
LL | | } else {
... |
-LL | | }
LL | | };
| |______^
|
@@ -197,7 +195,6 @@ LL | |
LL | | v_some
LL | | } else {
... |
-LL | | }
LL | | };
| |______^
|
@@ -306,7 +303,6 @@ LL | |
LL | | v_some
LL | | } else {
... |
-LL | | }
LL | | };
| |______^
|
diff --git a/src/tools/clippy/tests/ui/manual_unwrap_or.stderr b/src/tools/clippy/tests/ui/manual_unwrap_or.stderr
index c93a8952a0805..a5a64ecb9a3e0 100644
--- a/src/tools/clippy/tests/ui/manual_unwrap_or.stderr
+++ b/src/tools/clippy/tests/ui/manual_unwrap_or.stderr
@@ -36,7 +36,6 @@ LL | | Some(i) => i,
LL | | None => {
LL | | 42 + 42
... |
-LL | | }
LL | | };
| |_____^
|
@@ -130,7 +129,6 @@ LL | | Ok(i) => i,
LL | | Err(_) => {
LL | | 42 + 42
... |
-LL | | }
LL | | };
| |_____^
|
diff --git a/src/tools/clippy/tests/ui/map_flatten_fixable.stderr b/src/tools/clippy/tests/ui/map_flatten_fixable.stderr
index 128c95146aa2c..095bee52d6d71 100644
--- a/src/tools/clippy/tests/ui/map_flatten_fixable.stderr
+++ b/src/tools/clippy/tests/ui/map_flatten_fixable.stderr
@@ -77,9 +77,6 @@ error: called `map(..).flatten()` on `Option`
|
LL | .map(|_| {
| __________^
-LL | | // we need some newlines
-LL | | // so that the span is big enough
-LL | | // for a split output of the diagnostic
... |
LL | | })
LL | | .flatten();
diff --git a/src/tools/clippy/tests/ui/match_bool.stderr b/src/tools/clippy/tests/ui/match_bool.stderr
index 1303e082daf2f..fb24e67eceefd 100644
--- a/src/tools/clippy/tests/ui/match_bool.stderr
+++ b/src/tools/clippy/tests/ui/match_bool.stderr
@@ -75,9 +75,6 @@ error: you seem to be trying to match on a boolean expression
--> tests/ui/match_bool.rs:36:5
|
LL | / match test && test {
-LL | |
-LL | |
-LL | |
... |
LL | | _ => (),
LL | | };
diff --git a/src/tools/clippy/tests/ui/match_expr_like_matches_macro.stderr b/src/tools/clippy/tests/ui/match_expr_like_matches_macro.stderr
index 201b977e558eb..ffe5772ece90b 100644
--- a/src/tools/clippy/tests/ui/match_expr_like_matches_macro.stderr
+++ b/src/tools/clippy/tests/ui/match_expr_like_matches_macro.stderr
@@ -68,8 +68,7 @@ LL | let _ans = match x {
| ____________________^
LL | | E::A(_) => {
LL | | true
-LL | | }
-LL | | E::B(_) => true,
+... |
LL | | _ => false,
LL | | };
| |_________^ help: try: `matches!(x, E::A(_) | E::B(_))`
diff --git a/src/tools/clippy/tests/ui/missing_doc.stderr b/src/tools/clippy/tests/ui/missing_doc.stderr
index 133c76ac9d438..6554eed161062 100644
--- a/src/tools/clippy/tests/ui/missing_doc.stderr
+++ b/src/tools/clippy/tests/ui/missing_doc.stderr
@@ -72,7 +72,6 @@ LL | | /// dox
LL | | pub fn documented() {}
LL | | pub fn undocumented1() {}
... |
-LL | | }
LL | | }
| |_^
diff --git a/src/tools/clippy/tests/ui/missing_doc_crate_missing.stderr b/src/tools/clippy/tests/ui/missing_doc_crate_missing.stderr
index a421fb986d3a5..d6a4342c5031e 100644
--- a/src/tools/clippy/tests/ui/missing_doc_crate_missing.stderr
+++ b/src/tools/clippy/tests/ui/missing_doc_crate_missing.stderr
@@ -2,9 +2,7 @@ error: missing documentation for the crate
--> tests/ui/missing_doc_crate_missing.rs:1:1
|
LL | / #![warn(clippy::missing_docs_in_private_items)]
-LL | |
-LL | |
-LL | |
+... |
LL | | fn main() {}
| |____________^
|
diff --git a/src/tools/clippy/tests/ui/missing_fields_in_debug.stderr b/src/tools/clippy/tests/ui/missing_fields_in_debug.stderr
index 8c1810909dd86..5e51194c4b372 100644
--- a/src/tools/clippy/tests/ui/missing_fields_in_debug.stderr
+++ b/src/tools/clippy/tests/ui/missing_fields_in_debug.stderr
@@ -6,7 +6,6 @@ LL | |
LL | | // unused field: hidden
LL | | fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
... |
-LL | | }
LL | | }
| |_^
|
@@ -28,7 +27,6 @@ LL | |
LL | | // unused fields: hidden, hidden2, hidden4
LL | | fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
... |
-LL | | }
LL | | }
| |_^
|
@@ -58,7 +56,6 @@ LL | |
LL | | fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
LL | | let mut f = formatter.debug_struct("MultiExprDebugImpl");
... |
-LL | | }
LL | | }
| |_^
|
diff --git a/src/tools/clippy/tests/ui/needless_for_each_unfixable.stderr b/src/tools/clippy/tests/ui/needless_for_each_unfixable.stderr
index 9d3f639efbf27..682140a1dfdaa 100644
--- a/src/tools/clippy/tests/ui/needless_for_each_unfixable.stderr
+++ b/src/tools/clippy/tests/ui/needless_for_each_unfixable.stderr
@@ -6,7 +6,6 @@ LL | |
LL | |
LL | | if *v == 10 {
... |
-LL | | }
LL | | });
| |_______^
|
diff --git a/src/tools/clippy/tests/ui/needless_if.stderr b/src/tools/clippy/tests/ui/needless_if.stderr
index 9beae596ee39d..cbfeb979d2f20 100644
--- a/src/tools/clippy/tests/ui/needless_if.stderr
+++ b/src/tools/clippy/tests/ui/needless_if.stderr
@@ -34,7 +34,6 @@ error: this `if` branch is empty
LL | / if {
LL | | if let true = true
LL | | && true
-LL | | {
... |
LL | | } && true
LL | | {}
diff --git a/src/tools/clippy/tests/ui/never_loop.stderr b/src/tools/clippy/tests/ui/never_loop.stderr
index 440a2b5aabaae..dab3488af106f 100644
--- a/src/tools/clippy/tests/ui/never_loop.stderr
+++ b/src/tools/clippy/tests/ui/never_loop.stderr
@@ -2,9 +2,6 @@ error: this loop never actually loops
--> tests/ui/never_loop.rs:12:5
|
LL | / loop {
-LL | |
-LL | |
-LL | | // clippy::never_loop
... |
LL | | break;
LL | | }
@@ -75,7 +72,6 @@ LL | |
LL | | // never loops
LL | | match x {
... |
-LL | | }
LL | | }
| |_____^
|
@@ -126,7 +122,6 @@ LL | |
LL | | 'b: {
LL | | break 'b 'c: {
... |
-LL | | }
LL | | }
| |_____^
diff --git a/src/tools/clippy/tests/ui/option_if_let_else.stderr b/src/tools/clippy/tests/ui/option_if_let_else.stderr
index 37ef791edb008..32ff227632343 100644
--- a/src/tools/clippy/tests/ui/option_if_let_else.stderr
+++ b/src/tools/clippy/tests/ui/option_if_let_else.stderr
@@ -115,8 +115,7 @@ LL | let _ = if let Some(x) = arg {
| _____________^
LL | | x
LL | | } else {
-LL | | // map_or_else must be suggested
-LL | | side_effect()
+... |
LL | | };
| |_____^ help: try: `arg.map_or_else(side_effect, |x| x)`
diff --git a/src/tools/clippy/tests/ui/question_mark.stderr b/src/tools/clippy/tests/ui/question_mark.stderr
index 0a48c4e80cb60..06a8bd0de349f 100644
--- a/src/tools/clippy/tests/ui/question_mark.stderr
+++ b/src/tools/clippy/tests/ui/question_mark.stderr
@@ -183,8 +183,7 @@ error: this block may be rewritten with the `?` operator
|
LL | / if a.is_none() {
LL | | return None;
-LL | | // do lint here, the outer `try` is not relevant here
-LL | | // https://github.com/rust-lang/rust-clippy/pull/11001#issuecomment-1610636867
+... |
LL | | }
| |_____________^ help: replace it with: `a?;`
diff --git a/src/tools/clippy/tests/ui/significant_drop_tightening.stderr b/src/tools/clippy/tests/ui/significant_drop_tightening.stderr
index 2d7da4f394d39..7d7e3ac7d0ae2 100644
--- a/src/tools/clippy/tests/ui/significant_drop_tightening.stderr
+++ b/src/tools/clippy/tests/ui/significant_drop_tightening.stderr
@@ -5,8 +5,7 @@ LL | pub fn complex_return_triggers_the_lint() -> i32 {
| __________________________________________________-
LL | | fn foo() -> i32 {
LL | | 1
-LL | | }
-LL | | let mutex = Mutex::new(1);
+... |
LL | | let lock = mutex.lock().unwrap();
| | ^^^^
... |
diff --git a/src/tools/clippy/tests/ui/single_match.stderr b/src/tools/clippy/tests/ui/single_match.stderr
index 9240b09c50a9f..dd03737279ad1 100644
--- a/src/tools/clippy/tests/ui/single_match.stderr
+++ b/src/tools/clippy/tests/ui/single_match.stderr
@@ -22,10 +22,7 @@ error: you seem to be trying to use `match` for destructuring a single pattern.
--> tests/ui/single_match.rs:23:5
|
LL | / match x {
-LL | | // Note the missing block braces.
-LL | | // We suggest `if let Some(y) = x { .. }` because the macro
-LL | | // is expanded before we can do anything.
-LL | | Some(y) => println!("{:?}", y),
+... |
LL | | _ => (),
LL | | }
| |_____^ help: try: `if let Some(y) = x { println!("{:?}", y) }`
diff --git a/src/tools/clippy/tests/ui/single_match_else.stderr b/src/tools/clippy/tests/ui/single_match_else.stderr
index a2801751a430a..aa494520b8419 100644
--- a/src/tools/clippy/tests/ui/single_match_else.stderr
+++ b/src/tools/clippy/tests/ui/single_match_else.stderr
@@ -68,8 +68,7 @@ LL | / match Result::<i32, &Infallible>::Ok(1) {
LL | | Ok(a) => println!("${:?}", a),
LL | | Err(_) => {
LL | | println!("else block");
-LL | | return;
-LL | | }
+... |
LL | | }
| |_____^
|
@@ -88,8 +87,7 @@ LL | / match Cow::from("moo") {
LL | | Cow::Owned(a) => println!("${:?}", a),
LL | | Cow::Borrowed(_) => {
LL | | println!("else block");
-LL | | return;
-LL | | }
+... |
LL | | }
| |_____^
|
diff --git a/src/tools/clippy/tests/ui/temporary_assignment.stderr b/src/tools/clippy/tests/ui/temporary_assignment.stderr
index 8c28459407572..7e6529cb21344 100644
--- a/src/tools/clippy/tests/ui/temporary_assignment.stderr
+++ b/src/tools/clippy/tests/ui/temporary_assignment.stderr
@@ -13,8 +13,7 @@ error: assignment to temporary
LL | / MultiStruct {
LL | |
LL | | structure: Struct { field: 0 },
-LL | | }
-LL | | .structure
+... |
LL | | .field = 1;
| |______________^
diff --git a/src/tools/clippy/tests/ui/unit_cmp.stderr b/src/tools/clippy/tests/ui/unit_cmp.stderr
index f9473d3be2627..9e067edb84679 100644
--- a/src/tools/clippy/tests/ui/unit_cmp.stderr
+++ b/src/tools/clippy/tests/ui/unit_cmp.stderr
@@ -34,7 +34,6 @@ LL | |
LL | | {
LL | | true;
... |
-LL | | }
LL | | );
| |_____^
@@ -46,7 +45,6 @@ LL | |
LL | | {
LL | | true;
... |
-LL | | }
LL | | );
| |_____^
@@ -58,7 +56,6 @@ LL | |
LL | | {
LL | | true;
... |
-LL | | }
LL | | );
| |_____^
@@ -70,7 +67,6 @@ LL | |
LL | | {
LL | | true;
... |
-LL | | }
LL | | );
| |_____^
diff --git a/src/tools/clippy/tests/ui/unnecessary_lazy_eval.stderr b/src/tools/clippy/tests/ui/unnecessary_lazy_eval.stderr
index bcdf65b217e51..35a2144c389f2 100644
--- a/src/tools/clippy/tests/ui/unnecessary_lazy_eval.stderr
+++ b/src/tools/clippy/tests/ui/unnecessary_lazy_eval.stderr
@@ -434,11 +434,7 @@ error: unnecessary closure used to substitute value for `Result::Err`
|
LL | let _: Result<usize, usize> = res.
| ___________________________________^
-LL | | // some lines
-LL | | // some lines
-LL | | // some lines
... |
-LL | | // some lines
LL | | or_else(|_| Ok(ext_str.some_field));
| |_______________________________________^
|
diff --git a/src/tools/clippy/tests/ui/unnecessary_wraps.stderr b/src/tools/clippy/tests/ui/unnecessary_wraps.stderr
index 59986d895b30e..b304d4dce6ea9 100644
--- a/src/tools/clippy/tests/ui/unnecessary_wraps.stderr
+++ b/src/tools/clippy/tests/ui/unnecessary_wraps.stderr
@@ -6,7 +6,6 @@ LL | |
LL | |
LL | | if a && b {
... |
-LL | | }
LL | | }
| |_^
|
@@ -112,7 +111,6 @@ LL | |
LL | | if a && b {
LL | | return Some(());
... |
-LL | | }
LL | | }
| |_^
|
@@ -139,7 +137,6 @@ LL | |
LL | | if a && b {
LL | | return Ok(());
... |
-LL | | }
LL | | }
| |_^
|
diff --git a/src/tools/clippy/tests/ui/unwrap_in_result.stderr b/src/tools/clippy/tests/ui/unwrap_in_result.stderr
index 752177aaca57e..201d4ae36ae3d 100644
--- a/src/tools/clippy/tests/ui/unwrap_in_result.stderr
+++ b/src/tools/clippy/tests/ui/unwrap_in_result.stderr
@@ -6,7 +6,6 @@ LL | |
LL | | // checks whether a string represents a number divisible by 3
LL | | let i = i_str.parse::<i32>().unwrap();
... |
-LL | | }
LL | | }
| |_____^
|
diff --git a/src/tools/clippy/tests/ui/vec_init_then_push.stderr b/src/tools/clippy/tests/ui/vec_init_then_push.stderr
index 58720c9a18135..f35625c9b0859 100644
--- a/src/tools/clippy/tests/ui/vec_init_then_push.stderr
+++ b/src/tools/clippy/tests/ui/vec_init_then_push.stderr
@@ -2,8 +2,7 @@ error: calls to `push` immediately after creation
--> tests/ui/vec_init_then_push.rs:5:5
|
LL | / let mut def_err: Vec<u32> = Default::default();
-LL | |
-LL | |
+... |
LL | | def_err.push(0);
| |____________________^ help: consider using the `vec![]` macro: `let def_err: Vec<u32> = vec![..];`
|
diff --git a/src/tools/clippy/tests/ui/while_let_loop.stderr b/src/tools/clippy/tests/ui/while_let_loop.stderr
index 5212d4fdcc7b8..10c2311d82f7f 100644
--- a/src/tools/clippy/tests/ui/while_let_loop.stderr
+++ b/src/tools/clippy/tests/ui/while_let_loop.stderr
@@ -6,7 +6,6 @@ LL | |
LL | |
LL | | if let Some(_x) = y {
... |
-LL | | }
LL | | }
| |_____^ help: try: `while let Some(_x) = y { .. }`
|
@@ -45,7 +44,6 @@ LL | |
LL | | let x = match y {
LL | | Some(x) => x,
... |
-LL | | }
LL | | }
| |_____^ help: try: `while let Some(x) = y { .. }`
diff --git a/src/tools/miri/src/helpers.rs b/src/tools/miri/src/helpers.rs
index b57ce4e070c38..1f7c60ad1bdfe 100644
--- a/src/tools/miri/src/helpers.rs
+++ b/src/tools/miri/src/helpers.rs
@@ -149,10 +149,9 @@ pub fn iter_exported_symbols<'tcx>(
let dependency_formats = tcx.dependency_formats(());
// Find the dependencies of the executable we are running.
let dependency_format = dependency_formats
- .iter()
- .find(|(crate_type, _)| *crate_type == CrateType::Executable)
+ .get(&CrateType::Executable)
.expect("interpreting a non-executable crate");
- for cnum in dependency_format.1.iter().enumerate().filter_map(|(num, &linkage)| {
+ for cnum in dependency_format.iter().enumerate().filter_map(|(num, &linkage)| {
// We add 1 to the number because that's what rustc also does everywhere it
// calls `CrateNum::new`...
#[expect(clippy::arithmetic_side_effects)]
diff --git a/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr b/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr
index 23a9f8f9c288f..6540543d8da3f 100644
--- a/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr
+++ b/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr
@@ -24,8 +24,7 @@ note: inside `main`
LL | / thread::spawn(|| {
LL | | unsafe {
LL | | assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_OBJECT_0);
-LL | | }
-LL | | })
+... |
LL | | .join()
| |___________^
diff --git a/src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.stack.stderr b/src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.stack.stderr
index d9ab782986fbe..2875a5be28544 100644
--- a/src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.stack.stderr
+++ b/src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.stack.stderr
@@ -14,7 +14,6 @@ LL | | let _unit: ();
LL | | {
LL | | let non_copy = S(42);
... |
-LL | | }
LL | | }
| |_____^
help: <TAG> is this argument
diff --git a/src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.tree.stderr b/src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.tree.stderr
index 677952b39da10..c699987b79605 100644
--- a/src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.tree.stderr
+++ b/src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.tree.stderr
@@ -16,7 +16,6 @@ LL | | let _unit: ();
LL | | {
LL | | let non_copy = S(42);
... |
-LL | | }
LL | | }
| |_____^
help: the protected tag <TAG> was created here, in the initial state Reserved
diff --git a/src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.stack.stderr b/src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.stack.stderr
index efdd6129d7443..f20ec00f97bdb 100644
--- a/src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.stack.stderr
+++ b/src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.stack.stderr
@@ -14,7 +14,6 @@ LL | | let _unit: ();
LL | | {
LL | | let non_copy = S(42);
... |
-LL | |
LL | | }
| |_____^
help: <TAG> is this argument
diff --git a/src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.tree.stderr b/src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.tree.stderr
index 5746ad1e13d1a..8996c3643db74 100644
--- a/src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.tree.stderr
+++ b/src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.tree.stderr
@@ -16,7 +16,6 @@ LL | | let _unit: ();
LL | | {
LL | | let non_copy = S(42);
... |
-LL | |
LL | | }
| |_____^
help: the protected tag <TAG> was created here, in the initial state Reserved
diff --git a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.stack.stderr b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.stack.stderr
index b009b0901c416..47e5ee48292f7 100644
--- a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.stack.stderr
+++ b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.stack.stderr
@@ -14,7 +14,6 @@ LL | | {
LL | | let x = 0;
LL | | let ptr = &raw mut x;
... |
-LL | | }
LL | | }
| |_____^
help: <TAG> is this argument
diff --git a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.tree.stderr b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.tree.stderr
index 6d2cbe9b7cd68..7eb237ca1a722 100644
--- a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.tree.stderr
+++ b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.tree.stderr
@@ -16,7 +16,6 @@ LL | | {
LL | | let x = 0;
LL | | let ptr = &raw mut x;
... |
-LL | | }
LL | | }
| |_____^
help: the protected tag <TAG> was created here, in the initial state Reserved
diff --git a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.stack.stderr b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.stack.stderr
index 54f9a7aebd604..813042f06a6ca 100644
--- a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.stack.stderr
+++ b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.stack.stderr
@@ -14,7 +14,6 @@ LL | | {
LL | | let _x = 0;
LL | | let ptr = &raw mut _x;
... |
-LL | | }
LL | | }
| |_____^
help: <TAG> is this argument
diff --git a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.tree.stderr b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.tree.stderr
index 693534be2e00d..5090ec06b7808 100644
--- a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.tree.stderr
+++ b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.tree.stderr
@@ -16,7 +16,6 @@ LL | | {
LL | | let _x = 0;
LL | | let ptr = &raw mut _x;
... |
-LL | | }
LL | | }
| |_____^
help: the protected tag <TAG> was created here, in the initial state Reserved
diff --git a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.stack.stderr b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.stack.stderr
index 520937beaeb8c..a6a0362a22666 100644
--- a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.stack.stderr
+++ b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.stack.stderr
@@ -14,7 +14,6 @@ LL | | {
LL | | let _x = 0;
LL | | let ptr = &raw mut _x;
... |
-LL | | }
LL | | }
| |_____^
help: <TAG> is this argument
diff --git a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.tree.stderr b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.tree.stderr
index a879189d0c139..26a54fe87486b 100644
--- a/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.tree.stderr
+++ b/src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.tree.stderr
@@ -16,7 +16,6 @@ LL | | {
LL | | let _x = 0;
LL | | let ptr = &raw mut _x;
... |
-LL | | }
LL | | }
| |_____^
help: the protected tag <TAG> was created here, in the initial state Reserved
diff --git a/tests/crashes/123861.rs b/tests/crashes/123861.rs
deleted file mode 100644
index 60245960af0d6..0000000000000
--- a/tests/crashes/123861.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//@ known-bug: #123861
-//@ needs-rustc-debug-assertions
-
-struct _;
-fn mainIterator<_ = _> {}
diff --git a/tests/crashes/133426.rs b/tests/crashes/133426.rs
new file mode 100644
index 0000000000000..307a94c0f6ca6
--- /dev/null
+++ b/tests/crashes/133426.rs
@@ -0,0 +1,12 @@
+//@ known-bug: #133426
+
+fn a(
+ _: impl Iterator<
+ Item = [(); {
+ match *todo!() { ! };
+ }],
+ >,
+) {
+}
+
+fn b(_: impl Iterator<Item = { match 0 { ! } }>) {}
diff --git a/tests/crashes/133597.rs b/tests/crashes/133597.rs
new file mode 100644
index 0000000000000..f716d5e7bc74f
--- /dev/null
+++ b/tests/crashes/133597.rs
@@ -0,0 +1,11 @@
+//@ known-bug: #133597
+
+pub trait Foo2 {
+ fn boxed<'a: 'a>() -> impl Sized + FnOnce<()>;
+}
+
+impl Foo2 for () {}
+
+
+fn f() -> impl FnOnce<()> { || () }
+fn main() { () = f(); }
diff --git a/tests/crashes/133639.rs b/tests/crashes/133639.rs
new file mode 100644
index 0000000000000..d522b0730cf86
--- /dev/null
+++ b/tests/crashes/133639.rs
@@ -0,0 +1,33 @@
+//@ known-bug: #133639
+
+#![feature(with_negative_coherence)]
+#![feature(min_specialization)]
+#![feature(generic_const_exprs)]
+
+#![crate_type = "lib"]
+use std::str::FromStr;
+
+struct a<const b: bool>;
+
+trait c {}
+
+impl<const d: u32> FromStr for e<d>
+where
+ a<{ d <= 2 }>: c,
+{
+ type Err = ();
+ fn from_str(f: &str) -> Result<Self, Self::Err> {
+ unimplemented!()
+ }
+}
+struct e<const d: u32>;
+
+impl<const d: u32> FromStr for e<d>
+where
+ a<{ d <= 2 }>: c,
+{
+ type Err = ();
+ fn from_str(f: &str) -> Result<Self, Self::Err> {
+ unimplemented!()
+ }
+}
diff --git a/tests/crashes/133808.rs b/tests/crashes/133808.rs
new file mode 100644
index 0000000000000..9c6a23d1e35b5
--- /dev/null
+++ b/tests/crashes/133808.rs
@@ -0,0 +1,15 @@
+//@ known-bug: #133808
+
+#![feature(generic_const_exprs, transmutability)]
+
+mod assert {
+ use std::mem::TransmuteFrom;
+
+ pub fn is_transmutable<Src, Dst>()
+ where
+ Dst: TransmuteFrom<Src>,
+ {
+ }
+}
+
+pub fn main() {}
diff --git a/tests/crashes/133868.rs b/tests/crashes/133868.rs
new file mode 100644
index 0000000000000..dc25cb9df288e
--- /dev/null
+++ b/tests/crashes/133868.rs
@@ -0,0 +1,13 @@
+//@ known-bug: #133868
+
+trait Foo {
+ type Assoc;
+}
+
+trait Bar {
+ fn method() -> impl Sized;
+}
+impl<T> Bar for T where <T as Foo>::Assoc: Sized
+{
+ fn method() {}
+}
diff --git a/tests/crashes/133965.rs b/tests/crashes/133965.rs
new file mode 100644
index 0000000000000..69f533ccbe987
--- /dev/null
+++ b/tests/crashes/133965.rs
@@ -0,0 +1,9 @@
+//@ known-bug: #133965
+//@ needs-rustc-debug-assertions
+
+struct NonGeneric {}
+
+#[derive(Default)]
+struct NonGeneric<'a, const N: usize> {}
+
+pub fn main() {}
diff --git a/tests/crashes/133966.rs b/tests/crashes/133966.rs
new file mode 100644
index 0000000000000..25a881ae99b4f
--- /dev/null
+++ b/tests/crashes/133966.rs
@@ -0,0 +1,3 @@
+//@ known-bug: #133966
+pub struct Data([[&'static str]; 5_i32]);
+const _: &'static Data = unsafe { &*(&[] as *const Data) };
diff --git a/tests/crashes/134005.rs b/tests/crashes/134005.rs
new file mode 100644
index 0000000000000..c1f4c758a14ec
--- /dev/null
+++ b/tests/crashes/134005.rs
@@ -0,0 +1,5 @@
+//@ known-bug: #134005
+
+fn main() {
+ let _ = [std::ops::Add::add, std::ops::Mul::mul, main as fn(_, &_)];
+}
diff --git a/tests/crashes/134061.rs b/tests/crashes/134061.rs
new file mode 100644
index 0000000000000..e00eb7603fead
--- /dev/null
+++ b/tests/crashes/134061.rs
@@ -0,0 +1,4 @@
+//@ known-bug: #134061
+//@ needs-rustc-debug-assertions
+
+const x: () = |&'a
diff --git a/tests/crashes/134162.rs b/tests/crashes/134162.rs
new file mode 100644
index 0000000000000..9e5a4a1cb0bf3
--- /dev/null
+++ b/tests/crashes/134162.rs
@@ -0,0 +1,8 @@
+//@ known-bug: #134162
+
+fn main() {
+ struct X;
+
+ let xs = [X, X, X];
+ let eq = xs == [panic!("panic evaluated"); 2];
+}
diff --git a/tests/crashes/134217.rs b/tests/crashes/134217.rs
new file mode 100644
index 0000000000000..1b14c660e8b4c
--- /dev/null
+++ b/tests/crashes/134217.rs
@@ -0,0 +1,9 @@
+//@ known-bug: #134217
+
+impl<A> std::ops::CoerceUnsized<A> for A {}
+
+fn main() {
+ if let _ = true
+ && true
+ {}
+}
diff --git a/tests/rustdoc-js-std/osstring-to-string.js b/tests/rustdoc-js-std/osstring-to-string.js
index 3fdc0b9f24a3c..17bb602a502af 100644
--- a/tests/rustdoc-js-std/osstring-to-string.js
+++ b/tests/rustdoc-js-std/osstring-to-string.js
@@ -4,6 +4,6 @@
const EXPECTED = {
'query': 'OsString -> String',
'others': [
- { 'path': 'std::ffi::os_str::OsString', 'name': 'into_string' },
+ { 'path': 'std::ffi::OsString', 'name': 'into_string' },
]
};
diff --git a/tests/rustdoc-js/reexport.js b/tests/rustdoc-js/reexport.js
index 9021cc2e90fe0..0b9415dd3e480 100644
--- a/tests/rustdoc-js/reexport.js
+++ b/tests/rustdoc-js/reexport.js
@@ -14,4 +14,13 @@ const EXPECTED = [
{ 'path': 'reexport', 'name': 'AnotherOne' },
],
},
+ {
+ 'query': 'fn:Equivalent::equivalent',
+ 'others': [
+ // These results must never contain `reexport::equivalent::NotEquivalent`,
+ // since that path does not exist.
+ { 'path': 'equivalent::Equivalent', 'name': 'equivalent' },
+ { 'path': 'reexport::NotEquivalent', 'name': 'equivalent' },
+ ],
+ },
];
diff --git a/tests/rustdoc-js/reexport.rs b/tests/rustdoc-js/reexport.rs
index 0b3718cd9a3e8..ecbbeca5ea89d 100644
--- a/tests/rustdoc-js/reexport.rs
+++ b/tests/rustdoc-js/reexport.rs
@@ -2,6 +2,15 @@
// This is a DWIM case, since renaming the export probably means the intent is also different.
// For the de-duplication case of exactly the same name, see reexport-dedup
+//@ aux-crate:equivalent=equivalent.rs
+//@ compile-flags: --extern equivalent
+//@ aux-build:equivalent.rs
+//@ build-aux-docs
+#[doc(inline)]
+pub extern crate equivalent;
+#[doc(inline)]
+pub use equivalent::Equivalent as NotEquivalent;
+
pub mod fmt {
pub struct Subscriber;
}
diff --git a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr b/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr
index fc47404734eed..385b2ccacc1b3 100644
--- a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr
+++ b/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr
@@ -4,7 +4,6 @@ error: unclosed quote string `"`
LL | / /// ```{class="}
LL | | /// main;
LL | | /// ```
-LL | |
... |
LL | | /// main;
LL | | /// ```
@@ -23,7 +22,6 @@ error: unclosed quote string `"`
LL | / /// ```{class="}
LL | | /// main;
LL | | /// ```
-LL | |
... |
LL | | /// main;
LL | | /// ```
diff --git a/tests/rustdoc-ui/issues/ice-generic-type-alias-105742.stderr b/tests/rustdoc-ui/issues/ice-generic-type-alias-105742.stderr
index 06a1cf6b118da..f9080bf07853f 100644
--- a/tests/rustdoc-ui/issues/ice-generic-type-alias-105742.stderr
+++ b/tests/rustdoc-ui/issues/ice-generic-type-alias-105742.stderr
@@ -308,19 +308,12 @@ LL | pub trait SVec: Index<
| | |
| | this trait cannot be made into an object...
LL | | <Self as SVec>::Item,
-LL | |
-LL | |
... |
LL | |/ Output = <Index<<Self as SVec>::Item,
-LL | ||
-LL | ||
-LL | ||
... ||
-LL | ||
LL | || Output = <Self as SVec>::Item> as SVec>::Item,
| ||_________________________________________________^ ...because it uses `Self` as a type parameter
... |
-LL | |
LL | | > {
| |__^ ...because it uses `Self` as a type parameter
help: consider using an opaque type instead
diff --git a/tests/rustdoc-ui/lints/check-attr.stderr b/tests/rustdoc-ui/lints/check-attr.stderr
index e23806e0bab96..3366c021727cd 100644
--- a/tests/rustdoc-ui/lints/check-attr.stderr
+++ b/tests/rustdoc-ui/lints/check-attr.stderr
@@ -2,9 +2,6 @@ error: unknown attribute `compile-fail`
--> $DIR/check-attr.rs:3:1
|
LL | / /// foo
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -22,9 +19,6 @@ error: unknown attribute `compilefail`
--> $DIR/check-attr.rs:3:1
|
LL | / /// foo
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -37,9 +31,6 @@ error: unknown attribute `comPile_fail`
--> $DIR/check-attr.rs:3:1
|
LL | / /// foo
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -52,9 +43,6 @@ error: unknown attribute `should-panic`
--> $DIR/check-attr.rs:13:1
|
LL | / /// bar
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -67,9 +55,6 @@ error: unknown attribute `shouldpanic`
--> $DIR/check-attr.rs:13:1
|
LL | / /// bar
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -82,9 +67,6 @@ error: unknown attribute `sHould_panic`
--> $DIR/check-attr.rs:13:1
|
LL | / /// bar
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -97,9 +79,6 @@ error: unknown attribute `no-run`
--> $DIR/check-attr.rs:23:1
|
LL | / /// foobar
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -112,9 +91,6 @@ error: unknown attribute `norun`
--> $DIR/check-attr.rs:23:1
|
LL | / /// foobar
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -127,9 +103,6 @@ error: unknown attribute `no_Run`
--> $DIR/check-attr.rs:23:1
|
LL | / /// foobar
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -142,9 +115,6 @@ error: unknown attribute `test-harness`
--> $DIR/check-attr.rs:33:1
|
LL | / /// b
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -157,9 +127,6 @@ error: unknown attribute `testharness`
--> $DIR/check-attr.rs:33:1
|
LL | / /// b
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
@@ -172,9 +139,6 @@ error: unknown attribute `teSt_harness`
--> $DIR/check-attr.rs:33:1
|
LL | / /// b
-LL | |
-LL | |
-LL | |
... |
LL | | /// boo
LL | | /// ```
diff --git a/tests/rustdoc-ui/lints/check.stderr b/tests/rustdoc-ui/lints/check.stderr
index f1f36e8830d6d..dcdf25dda649c 100644
--- a/tests/rustdoc-ui/lints/check.stderr
+++ b/tests/rustdoc-ui/lints/check.stderr
@@ -6,7 +6,6 @@ LL | |
LL | |
LL | | #![warn(missing_docs)]
... |
-LL | |
LL | | pub fn foo() {}
| |_______________^
|
diff --git a/tests/rustdoc-ui/unescaped_backticks.stderr b/tests/rustdoc-ui/unescaped_backticks.stderr
index 1e2b3528d4afd..d93aaf5f3ca94 100644
--- a/tests/rustdoc-ui/unescaped_backticks.stderr
+++ b/tests/rustdoc-ui/unescaped_backticks.stderr
@@ -271,9 +271,6 @@ error: unescaped backtick
--> $DIR/unescaped_backticks.rs:323:5
|
LL | / /// The Subscriber` may be accessed by calling [`WeakDispatch::upgrade`],
-LL | |
-LL | |
-LL | |
... |
LL | | /// [`rebuild_interest_cache`][rebuild] is called after the value of the max
LL | | /// level changes.
@@ -290,9 +287,6 @@ error: unescaped backtick
--> $DIR/unescaped_backticks.rs:323:5
|
LL | / /// The Subscriber` may be accessed by calling [`WeakDispatch::upgrade`],
-LL | |
-LL | |
-LL | |
... |
LL | | /// [`rebuild_interest_cache`][rebuild] is called after the value of the max
LL | | /// level changes.
@@ -307,9 +301,6 @@ error: unescaped backtick
--> $DIR/unescaped_backticks.rs:323:5
|
LL | / /// The Subscriber` may be accessed by calling [`WeakDispatch::upgrade`],
-LL | |
-LL | |
-LL | |
... |
LL | | /// [`rebuild_interest_cache`][rebuild] is called after the value of the max
LL | | /// level changes.
@@ -326,9 +317,6 @@ error: unescaped backtick
--> $DIR/unescaped_backticks.rs:323:5
|
LL | / /// The Subscriber` may be accessed by calling [`WeakDispatch::upgrade`],
-LL | |
-LL | |
-LL | |
... |
LL | | /// [`rebuild_interest_cache`][rebuild] is called after the value of the max
LL | | /// level changes.
diff --git a/tests/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr b/tests/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr
index de92841d7f18e..80ff10e13d889 100644
--- a/tests/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr
+++ b/tests/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr
@@ -7,8 +7,7 @@ LL | // fn oom(
LL | || info: &Layout,
LL | || ) -> ()
| ||_______- arguments to this function are incorrect
-LL | | {
-LL | | loop {}
+... |
LL | | }
| |__^ expected `&Layout`, found `Layout`
|
@@ -30,8 +29,7 @@ LL | // fn oom(
LL | || info: &Layout,
LL | || ) -> ()
| ||_______^ expected `!`, found `()`
-LL | | {
-LL | | loop {}
+... |
LL | | }
| |__- expected `!` because of return type
|
diff --git a/tests/ui/associated-types/associated-types-eq-2.stderr b/tests/ui/associated-types/associated-types-eq-2.stderr
index e5013a35d453b..ccd13123d7046 100644
--- a/tests/ui/associated-types/associated-types-eq-2.stderr
+++ b/tests/ui/associated-types/associated-types-eq-2.stderr
@@ -3,8 +3,7 @@ error[E0658]: associated const equality is incomplete
|
LL | impl Tr3<N
| __________^
-LL | |
-LL | |
+... |
LL | | = 42, T2 = Qux, T3 = usize> for Bar {
| |____^
|
@@ -198,8 +197,7 @@ error[E0229]: associated item constraints are not allowed here
|
LL | impl Tr3<N
| __________^
-LL | |
-LL | |
+... |
LL | | = 42, T2 = Qux, T3 = usize> for Bar {
| |____^ associated item constraint not allowed here
|
diff --git a/tests/ui/associated-types/issue-59324.stderr b/tests/ui/associated-types/issue-59324.stderr
index ec2890cc8e7f6..805c3e60bb6a8 100644
--- a/tests/ui/associated-types/issue-59324.stderr
+++ b/tests/ui/associated-types/issue-59324.stderr
@@ -2,8 +2,7 @@ error[E0277]: the trait bound `Bug: Foo` is not satisfied
--> $DIR/issue-59324.rs:11:1
|
LL | / pub trait ThriftService<Bug: NotFoo>:
-LL | |
-LL | |
+... |
LL | | Service<AssocType = <Bug as Foo>::OnlyFoo>
| |______________________________________________^ the trait `Foo` is not implemented for `Bug`
|
@@ -20,7 +19,6 @@ LL | |
LL | |
LL | | Service<AssocType = <Bug as Foo>::OnlyFoo>
... |
-LL | |
LL | | }
| |_^ the trait `Foo` is not implemented for `Bug`
|
diff --git a/tests/ui/async-await/async-block-control-flow-static-semantics.stderr b/tests/ui/async-await/async-block-control-flow-static-semantics.stderr
index 3bc467cc84de9..4ed15a942c674 100644
--- a/tests/ui/async-await/async-block-control-flow-static-semantics.stderr
+++ b/tests/ui/async-await/async-block-control-flow-static-semantics.stderr
@@ -23,7 +23,6 @@ LL | |
LL | | let block = async {
LL | | return 0u8;
... |
-LL | |
LL | | }
| |_^ expected `u8`, found `()`
diff --git a/tests/ui/async-await/dont-ice-for-type-mismatch-in-closure-in-async.stderr b/tests/ui/async-await/dont-ice-for-type-mismatch-in-closure-in-async.stderr
index 649a868faa5e9..b60f6a0833867 100644
--- a/tests/ui/async-await/dont-ice-for-type-mismatch-in-closure-in-async.stderr
+++ b/tests/ui/async-await/dont-ice-for-type-mismatch-in-closure-in-async.stderr
@@ -31,7 +31,6 @@ LL | |
LL | | if true {
LL | | false
... |
-LL | |
LL | | })
| |_____^ expected `bool`, found `Option<()>`
|
diff --git a/tests/ui/async-await/issue-84841.stderr b/tests/ui/async-await/issue-84841.stderr
index 1e22373ba6ea1..69c1c882d60ac 100644
--- a/tests/ui/async-await/issue-84841.stderr
+++ b/tests/ui/async-await/issue-84841.stderr
@@ -14,8 +14,7 @@ LL | async fn foo() {
LL | | // Adding an .await here avoids the ICE
LL | | test()?;
| | ^ cannot use the `?` operator in an async function that returns `()`
-LL | |
-LL | |
+... |
LL | | }
| |_- this function should return `Result` or `Option` to accept `?`
|
diff --git a/tests/ui/async-await/issues/issue-72312.stderr b/tests/ui/async-await/issues/issue-72312.stderr
index cd93f8a3c5597..8e6fb138a1faa 100644
--- a/tests/ui/async-await/issues/issue-72312.stderr
+++ b/tests/ui/async-await/issues/issue-72312.stderr
@@ -8,10 +8,7 @@ LL | pub async fn start(&self) {
| let's call the lifetime of this reference `'1`
...
LL | / require_static(async move {
-LL | |
-LL | |
-LL | |
-LL | | &self;
+... |
LL | | });
| | ^
| | |
diff --git a/tests/ui/async-await/track-caller/async-closure-gate.afn.stderr b/tests/ui/async-await/track-caller/async-closure-gate.afn.stderr
index 8344b7a07dc6f..6887a904211ec 100644
--- a/tests/ui/async-await/track-caller/async-closure-gate.afn.stderr
+++ b/tests/ui/async-await/track-caller/async-closure-gate.afn.stderr
@@ -66,8 +66,7 @@ LL | fn foo3() {
LL | / async {
LL | |
LL | | let _ = #[track_caller] || {
-LL | |
-LL | | };
+... |
LL | | }
| |_____^ expected `()`, found `async` block
|
diff --git a/tests/ui/async-await/track-caller/async-closure-gate.nofeat.stderr b/tests/ui/async-await/track-caller/async-closure-gate.nofeat.stderr
index 8344b7a07dc6f..6887a904211ec 100644
--- a/tests/ui/async-await/track-caller/async-closure-gate.nofeat.stderr
+++ b/tests/ui/async-await/track-caller/async-closure-gate.nofeat.stderr
@@ -66,8 +66,7 @@ LL | fn foo3() {
LL | / async {
LL | |
LL | | let _ = #[track_caller] || {
-LL | |
-LL | | };
+... |
LL | | }
| |_____^ expected `()`, found `async` block
|
diff --git a/tests/ui/attributes/collapse-debuginfo-invalid.stderr b/tests/ui/attributes/collapse-debuginfo-invalid.stderr
index 7cbbd1d647e71..70376f985cb12 100644
--- a/tests/ui/attributes/collapse-debuginfo-invalid.stderr
+++ b/tests/ui/attributes/collapse-debuginfo-invalid.stderr
@@ -45,7 +45,6 @@ LL | | let _ = #[collapse_debuginfo(yes)] || { };
LL | |
LL | | #[collapse_debuginfo(yes)]
... |
-LL | | }
LL | | }
| |_- not a macro definition
diff --git a/tests/ui/attributes/dump_def_parents.stderr b/tests/ui/attributes/dump_def_parents.stderr
index a928e8e33a4f7..74ecd9b0a8906 100644
--- a/tests/ui/attributes/dump_def_parents.stderr
+++ b/tests/ui/attributes/dump_def_parents.stderr
@@ -22,7 +22,6 @@ LL | |
LL | | fn bar() {
LL | | fn foo() {
... |
-LL | |
LL | | fn main() {}
| |____________^
@@ -66,7 +65,6 @@ LL | |
LL | | fn bar() {
LL | | fn foo() {
... |
-LL | |
LL | | fn main() {}
| |____________^
@@ -124,7 +122,6 @@ LL | |
LL | | fn bar() {
LL | | fn foo() {
... |
-LL | |
LL | | fn main() {}
| |____________^
@@ -173,7 +170,6 @@ LL | |
LL | | fn bar() {
LL | | fn foo() {
... |
-LL | |
LL | | fn main() {}
| |____________^
diff --git a/tests/ui/borrowck/issue-109271-pass-self-into-closure.stderr b/tests/ui/borrowck/issue-109271-pass-self-into-closure.stderr
index a66281a188d72..aa4e5fb2f6918 100644
--- a/tests/ui/borrowck/issue-109271-pass-self-into-closure.stderr
+++ b/tests/ui/borrowck/issue-109271-pass-self-into-closure.stderr
@@ -40,8 +40,6 @@ LL | v.call(|(), this: &mut S| {
| | |
| _____| first borrow later used by call
| |
-LL | |
-LL | |
... |
LL | | v.set();
| | - first borrow occurs due to use of `v` in closure
diff --git a/tests/ui/borrowck/no-invalid-mut-suggestion-for-raw-pointer-issue-127562.rs b/tests/ui/borrowck/no-invalid-mut-suggestion-for-raw-pointer-issue-127562.rs
new file mode 100644
index 0000000000000..5425e571af061
--- /dev/null
+++ b/tests/ui/borrowck/no-invalid-mut-suggestion-for-raw-pointer-issue-127562.rs
@@ -0,0 +1,8 @@
+//! Regression test for invalid suggestion for `&raw const expr` reported in
+//! <https://github.com/rust-lang/rust/issues/127562>.
+
+fn main() {
+ let val = 2;
+ let ptr = &raw const val;
+ unsafe { *ptr = 3; } //~ ERROR cannot assign to `*ptr`, which is behind a `*const` pointer
+}
diff --git a/tests/ui/borrowck/no-invalid-mut-suggestion-for-raw-pointer-issue-127562.stderr b/tests/ui/borrowck/no-invalid-mut-suggestion-for-raw-pointer-issue-127562.stderr
new file mode 100644
index 0000000000000..c27dcc19827d6
--- /dev/null
+++ b/tests/ui/borrowck/no-invalid-mut-suggestion-for-raw-pointer-issue-127562.stderr
@@ -0,0 +1,9 @@
+error[E0594]: cannot assign to `*ptr`, which is behind a `*const` pointer
+ --> $DIR/no-invalid-mut-suggestion-for-raw-pointer-issue-127562.rs:7:14
+ |
+LL | unsafe { *ptr = 3; }
+ | ^^^^^^^^ `ptr` is a `*const` pointer, so the data it refers to cannot be written
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/tests/ui/closures/2229_closure_analysis/arrays-completely-captured.stderr b/tests/ui/closures/2229_closure_analysis/arrays-completely-captured.stderr
index 3c4f2de73a420..cb351d3cebd40 100644
--- a/tests/ui/closures/2229_closure_analysis/arrays-completely-captured.stderr
+++ b/tests/ui/closures/2229_closure_analysis/arrays-completely-captured.stderr
@@ -16,7 +16,6 @@ LL | |
LL | |
LL | | m[0] += 10;
... |
-LL | |
LL | | };
| |_____^
|
@@ -39,7 +38,6 @@ LL | |
LL | |
LL | | m[0] += 10;
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/by_value.stderr b/tests/ui/closures/2229_closure_analysis/by_value.stderr
index f843b76d72343..af4ae34ad64e3 100644
--- a/tests/ui/closures/2229_closure_analysis/by_value.stderr
+++ b/tests/ui/closures/2229_closure_analysis/by_value.stderr
@@ -16,7 +16,6 @@ LL | |
LL | |
LL | | let p = t.0.0;
... |
-LL | |
LL | | };
| |_____^
|
@@ -39,7 +38,6 @@ LL | |
LL | |
LL | | let p = t.0.0;
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/capture-analysis-1.stderr b/tests/ui/closures/2229_closure_analysis/capture-analysis-1.stderr
index 64ae704bc90ef..eef201792c634 100644
--- a/tests/ui/closures/2229_closure_analysis/capture-analysis-1.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-1.stderr
@@ -16,7 +16,6 @@ LL | |
LL | |
LL | | println!("{:?}", p);
... |
-LL | |
LL | | };
| |_____^
|
@@ -49,7 +48,6 @@ LL | |
LL | |
LL | | println!("{:?}", p);
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/capture-analysis-2.stderr b/tests/ui/closures/2229_closure_analysis/capture-analysis-2.stderr
index 40c075f3cc802..8fe4d2d57ab0a 100644
--- a/tests/ui/closures/2229_closure_analysis/capture-analysis-2.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-2.stderr
@@ -16,7 +16,6 @@ LL | |
LL | |
LL | | let _x = p.x;
... |
-LL | |
LL | | };
| |_____^
|
@@ -39,7 +38,6 @@ LL | |
LL | |
LL | | let _x = p.x;
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/capture-analysis-3.stderr b/tests/ui/closures/2229_closure_analysis/capture-analysis-3.stderr
index a4689f2ea969a..f1dbefe15d525 100644
--- a/tests/ui/closures/2229_closure_analysis/capture-analysis-3.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-3.stderr
@@ -16,7 +16,6 @@ LL | |
LL | |
LL | | let _x = a.b.c;
... |
-LL | |
LL | | };
| |_____^
|
@@ -39,7 +38,6 @@ LL | |
LL | |
LL | | let _x = a.b.c;
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/capture-analysis-4.stderr b/tests/ui/closures/2229_closure_analysis/capture-analysis-4.stderr
index 9d3004dbbb02d..91c3d6d16745e 100644
--- a/tests/ui/closures/2229_closure_analysis/capture-analysis-4.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-analysis-4.stderr
@@ -16,7 +16,6 @@ LL | |
LL | |
LL | | let _x = a.b;
... |
-LL | |
LL | | };
| |_____^
|
@@ -39,7 +38,6 @@ LL | |
LL | |
LL | | let _x = a.b;
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.stderr b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.stderr
index 48fbd682a5bca..c9c227335a9e6 100644
--- a/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-struct.stderr
@@ -15,8 +15,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("{}", p.x);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -33,8 +32,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("{}", p.x);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.stderr b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.stderr
index 496511d60256d..84aac180fbb0c 100644
--- a/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-disjoint-field-tuple.stderr
@@ -15,8 +15,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("{}", t.0);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -33,8 +32,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("{}", t.0);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/capture-enums.stderr b/tests/ui/closures/2229_closure_analysis/capture-enums.stderr
index 2d70b6148583b..89a879cec468b 100644
--- a/tests/ui/closures/2229_closure_analysis/capture-enums.stderr
+++ b/tests/ui/closures/2229_closure_analysis/capture-enums.stderr
@@ -26,7 +26,6 @@ LL | |
LL | |
LL | | if let Info::Point(_, _, str) = point {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -59,7 +58,6 @@ LL | |
LL | |
LL | | if let Info::Point(_, _, str) = point {
... |
-LL | | }
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/deep-multilevel-struct.stderr b/tests/ui/closures/2229_closure_analysis/deep-multilevel-struct.stderr
index d118f7573a488..447ad8f4a68e1 100644
--- a/tests/ui/closures/2229_closure_analysis/deep-multilevel-struct.stderr
+++ b/tests/ui/closures/2229_closure_analysis/deep-multilevel-struct.stderr
@@ -16,7 +16,6 @@ LL | |
LL | |
LL | | let x = &p.a.p.x;
... |
-LL | |
LL | | };
| |_____^
|
@@ -44,7 +43,6 @@ LL | |
LL | |
LL | | let x = &p.a.p.x;
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr b/tests/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr
index cc5f74613e48f..639d1714721db 100644
--- a/tests/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr
+++ b/tests/ui/closures/2229_closure_analysis/deep-multilevel-tuple.stderr
@@ -16,7 +16,6 @@ LL | |
LL | |
LL | | let x = &t.0.0.0;
... |
-LL | |
LL | | };
| |_____^
|
@@ -44,7 +43,6 @@ LL | |
LL | |
LL | | let x = &t.0.0.0;
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.stderr b/tests/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.stderr
index 6dbe8c153c012..3e4c4d3ccd39c 100644
--- a/tests/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.stderr
+++ b/tests/ui/closures/2229_closure_analysis/feature-gate-capture_disjoint_fields.stderr
@@ -15,8 +15,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("This uses new capture analyysis to capture s={}", s);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -33,8 +32,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("This uses new capture analyysis to capture s={}", s);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/issue-87378.stderr b/tests/ui/closures/2229_closure_analysis/issue-87378.stderr
index 3273e92d9d171..862ae7445e8f1 100644
--- a/tests/ui/closures/2229_closure_analysis/issue-87378.stderr
+++ b/tests/ui/closures/2229_closure_analysis/issue-87378.stderr
@@ -15,8 +15,7 @@ LL | / || {
LL | |
LL | |
LL | | unsafe { u.value }
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -33,8 +32,7 @@ LL | / || {
LL | |
LL | |
LL | | unsafe { u.value }
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/issue-88476.stderr b/tests/ui/closures/2229_closure_analysis/issue-88476.stderr
index 1c0e254dbf708..225b0335cf535 100644
--- a/tests/ui/closures/2229_closure_analysis/issue-88476.stderr
+++ b/tests/ui/closures/2229_closure_analysis/issue-88476.stderr
@@ -23,11 +23,7 @@ error: First Pass analysis includes:
|
LL | let x = #[rustc_capture_analysis] move || {
| _______________________________________^
-LL | |
-LL | |
-LL | |
... |
-LL | |
LL | | };
| |_____^
|
@@ -42,11 +38,7 @@ error: Min Capture analysis includes:
|
LL | let x = #[rustc_capture_analysis] move || {
| _______________________________________^
-LL | |
-LL | |
-LL | |
... |
-LL | |
LL | | };
| |_____^
|
@@ -61,11 +53,7 @@ error: First Pass analysis includes:
|
LL | let c = #[rustc_capture_analysis] move || {
| _______________________________________^
-LL | |
-LL | |
-LL | |
... |
-LL | |
LL | | };
| |_____^
|
@@ -80,11 +68,7 @@ error: Min Capture analysis includes:
|
LL | let c = #[rustc_capture_analysis] move || {
| _______________________________________^
-LL | |
-LL | |
-LL | |
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.stderr b/tests/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.stderr
index 7125bfa31017b..e7e5e7f7fa1bf 100644
--- a/tests/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.stderr
+++ b/tests/ui/closures/2229_closure_analysis/match/patterns-capture-analysis.stderr
@@ -6,7 +6,6 @@ LL | |
LL | |
LL | | match variant {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -24,7 +23,6 @@ LL | |
LL | |
LL | | match variant {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -64,7 +62,6 @@ LL | |
LL | |
LL | | match variant {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -87,7 +84,6 @@ LL | |
LL | |
LL | | match variant {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -138,7 +134,6 @@ LL | |
LL | |
LL | | match variant {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -156,7 +151,6 @@ LL | |
LL | |
LL | | match variant {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -174,7 +168,6 @@ LL | |
LL | |
LL | | match slice {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -192,7 +185,6 @@ LL | |
LL | |
LL | | match slice {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -210,7 +202,6 @@ LL | |
LL | |
LL | | match slice {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -228,7 +219,6 @@ LL | |
LL | |
LL | | match slice {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -246,7 +236,6 @@ LL | |
LL | |
LL | | match slice {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -264,7 +253,6 @@ LL | |
LL | |
LL | | match slice {
... |
-LL | | }
LL | | };
| |_____^
|
@@ -281,8 +269,7 @@ LL | / || {
LL | |
LL | | match slice {
LL | | [..] => {},
-LL | | _ => {}
-LL | | }
+... |
LL | | };
| |_____^
diff --git a/tests/ui/closures/2229_closure_analysis/move_closure.stderr b/tests/ui/closures/2229_closure_analysis/move_closure.stderr
index 68754b8f7bee4..a4919d488d1ef 100644
--- a/tests/ui/closures/2229_closure_analysis/move_closure.stderr
+++ b/tests/ui/closures/2229_closure_analysis/move_closure.stderr
@@ -139,8 +139,7 @@ LL | / move || {
LL | |
LL | |
LL | | t.0.0 = "new S".into();
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -157,8 +156,7 @@ LL | / move || {
LL | |
LL | |
LL | | t.0.0 = "new S".into();
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -175,8 +173,7 @@ LL | / move || {
LL | |
LL | |
LL | | *ref_s += 10;
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -193,8 +190,7 @@ LL | / move || {
LL | |
LL | |
LL | | *ref_s += 10;
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -211,8 +207,7 @@ LL | / move || {
LL | |
LL | |
LL | | t.0.0 = "new s".into();
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -229,8 +224,7 @@ LL | / move || {
LL | |
LL | |
LL | | t.0.0 = "new s".into();
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -247,8 +241,7 @@ LL | / move || {
LL | |
LL | |
LL | | let _t = t.0.0;
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -265,8 +258,7 @@ LL | / move || {
LL | |
LL | |
LL | | let _t = t.0.0;
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -283,8 +275,7 @@ LL | / move || {
LL | |
LL | |
LL | | let _t = t.0.0;
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -301,8 +292,7 @@ LL | / move || {
LL | |
LL | |
LL | | let _t = t.0.0;
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -319,8 +309,7 @@ LL | / move || {
LL | |
LL | |
LL | | let _t = b.0;
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -337,8 +326,7 @@ LL | / move || {
LL | |
LL | |
LL | | let _t = b.0;
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -355,8 +343,7 @@ LL | / move || {
LL | |
LL | |
LL | | println!("{}", b.0);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -373,8 +360,7 @@ LL | / move || {
LL | |
LL | |
LL | | println!("{}", b.0);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -391,8 +377,7 @@ LL | / move || {
LL | |
LL | |
LL | | println!("{}", t.1.0);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -409,8 +394,7 @@ LL | / move || {
LL | |
LL | |
LL | | println!("{}", t.1.0);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/multilevel-path-2.stderr b/tests/ui/closures/2229_closure_analysis/multilevel-path-2.stderr
index 97f53e490e8dc..cbc7188a4ec4d 100644
--- a/tests/ui/closures/2229_closure_analysis/multilevel-path-2.stderr
+++ b/tests/ui/closures/2229_closure_analysis/multilevel-path-2.stderr
@@ -15,8 +15,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("{}", w.p.x);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -33,8 +32,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("{}", w.p.x);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/nested-closure.stderr b/tests/ui/closures/2229_closure_analysis/nested-closure.stderr
index 03550cb2d35c1..3b36069e62427 100644
--- a/tests/ui/closures/2229_closure_analysis/nested-closure.stderr
+++ b/tests/ui/closures/2229_closure_analysis/nested-closure.stderr
@@ -60,7 +60,6 @@ LL | |
LL | |
LL | | println!("{}", p.x);
... |
-LL | |
LL | | };
| |_____^
|
@@ -88,7 +87,6 @@ LL | |
LL | |
LL | | println!("{}", p.x);
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/path-with-array-access.stderr b/tests/ui/closures/2229_closure_analysis/path-with-array-access.stderr
index e82295f047b26..c6608c0590013 100644
--- a/tests/ui/closures/2229_closure_analysis/path-with-array-access.stderr
+++ b/tests/ui/closures/2229_closure_analysis/path-with-array-access.stderr
@@ -15,8 +15,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("{}", pent.points[5].x);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -33,8 +32,7 @@ LL | / || {
LL | |
LL | |
LL | | println!("{}", pent.points[5].x);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order.stderr b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order.stderr
index 65a0a317ab6f3..ff3cd5b8f01a3 100644
--- a/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order.stderr
+++ b/tests/ui/closures/2229_closure_analysis/preserve_field_drop_order.stderr
@@ -36,7 +36,6 @@ LL | |
LL | |
LL | | println!("{:?}", a.0);
... |
-LL | |
LL | | };
| |_____^
|
@@ -69,7 +68,6 @@ LL | |
LL | |
LL | | println!("{:?}", a.0);
... |
-LL | |
LL | | };
| |_____^
|
@@ -102,7 +100,6 @@ LL | |
LL | |
LL | | println!("{:?}", a.1);
... |
-LL | |
LL | | };
| |_____^
|
@@ -135,7 +132,6 @@ LL | |
LL | |
LL | | println!("{:?}", a.1);
... |
-LL | |
LL | | };
| |_____^
|
@@ -168,7 +164,6 @@ LL | |
LL | |
LL | | println!("{:?}", b.1);
... |
-LL | |
LL | | };
| |_____^
|
@@ -201,7 +196,6 @@ LL | |
LL | |
LL | | println!("{:?}", b.1);
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/repr_packed.stderr b/tests/ui/closures/2229_closure_analysis/repr_packed.stderr
index d4b2f8bfeae99..bab1e8f9977fe 100644
--- a/tests/ui/closures/2229_closure_analysis/repr_packed.stderr
+++ b/tests/ui/closures/2229_closure_analysis/repr_packed.stderr
@@ -118,7 +118,6 @@ LL | |
LL | |
LL | | println!("{}", foo.x);
... |
-LL | |
LL | | };
| |_____^
|
@@ -141,7 +140,6 @@ LL | |
LL | |
LL | | println!("{}", foo.x);
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/simple-struct-min-capture.stderr b/tests/ui/closures/2229_closure_analysis/simple-struct-min-capture.stderr
index a88bd01093a78..d4201b2d4c22b 100644
--- a/tests/ui/closures/2229_closure_analysis/simple-struct-min-capture.stderr
+++ b/tests/ui/closures/2229_closure_analysis/simple-struct-min-capture.stderr
@@ -16,7 +16,6 @@ LL | |
LL | |
LL | | p.x += 10;
... |
-LL | |
LL | | };
| |_____^
|
@@ -39,7 +38,6 @@ LL | |
LL | |
LL | | p.x += 10;
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/unsafe_ptr.stderr b/tests/ui/closures/2229_closure_analysis/unsafe_ptr.stderr
index 54463c5277d5f..9f3c6576c7213 100644
--- a/tests/ui/closures/2229_closure_analysis/unsafe_ptr.stderr
+++ b/tests/ui/closures/2229_closure_analysis/unsafe_ptr.stderr
@@ -25,8 +25,7 @@ LL | / || unsafe {
LL | |
LL | |
LL | | println!("{:?}", (*t.0).s);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
@@ -43,8 +42,7 @@ LL | / || unsafe {
LL | |
LL | |
LL | | println!("{:?}", (*t.0).s);
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/closures/2229_closure_analysis/wild_patterns.stderr b/tests/ui/closures/2229_closure_analysis/wild_patterns.stderr
index 4d6d85649da13..4cb0f4a4a9274 100644
--- a/tests/ui/closures/2229_closure_analysis/wild_patterns.stderr
+++ b/tests/ui/closures/2229_closure_analysis/wild_patterns.stderr
@@ -32,11 +32,7 @@ error: First Pass analysis includes:
--> $DIR/wild_patterns.rs:26:5
|
LL | / || {
-LL | |
-LL | |
-LL | | // FIXME(arora-aman): Change `_x` to `_`
... |
-LL | |
LL | | };
| |_____^
|
@@ -50,11 +46,7 @@ error: Min Capture analysis includes:
--> $DIR/wild_patterns.rs:26:5
|
LL | / || {
-LL | |
-LL | |
-LL | | // FIXME(arora-aman): Change `_x` to `_`
... |
-LL | |
LL | | };
| |_____^
|
@@ -68,11 +60,7 @@ error: First Pass analysis includes:
--> $DIR/wild_patterns.rs:45:5
|
LL | / || {
-LL | |
-LL | |
-LL | | // FIXME(arora-aman): Change `_x` to `_`
... |
-LL | |
LL | | };
| |_____^
|
@@ -86,11 +74,7 @@ error: Min Capture analysis includes:
--> $DIR/wild_patterns.rs:45:5
|
LL | / || {
-LL | |
-LL | |
-LL | | // FIXME(arora-aman): Change `_x` to `_`
... |
-LL | |
LL | | };
| |_____^
|
@@ -104,11 +88,7 @@ error: First Pass analysis includes:
--> $DIR/wild_patterns.rs:64:5
|
LL | / || {
-LL | |
-LL | |
-LL | | // FIXME(arora-aman): Change `_x` to `_`
... |
-LL | |
LL | | };
| |_____^
|
@@ -122,11 +102,7 @@ error: Min Capture analysis includes:
--> $DIR/wild_patterns.rs:64:5
|
LL | / || {
-LL | |
-LL | |
-LL | | // FIXME(arora-aman): Change `_x` to `_`
... |
-LL | |
LL | | };
| |_____^
|
diff --git a/tests/ui/codemap_tests/huge_multispan_highlight.ascii.svg b/tests/ui/codemap_tests/huge_multispan_highlight.ascii.svg
index 6f46df0101e73..1cedbf75e4bf6 100644
--- a/tests/ui/codemap_tests/huge_multispan_highlight.ascii.svg
+++ b/tests/ui/codemap_tests/huge_multispan_highlight.ascii.svg
@@ -1,4 +1,4 @@
-<svg width="743px" height="848px" xmlns="http://www.w3.org/2000/svg">
+<svg width="743px" height="758px" xmlns="http://www.w3.org/2000/svg">
<style>
.fg { fill: #AAAAAA }
.bg { background: #000000 }
@@ -33,83 +33,73 @@
</tspan>
<tspan x="10px" y="136px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold"> _________________-</tspan>
</tspan>
- <tspan x="10px" y="154px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> // last line shown in multispan header</tspan>
+ <tspan x="10px" y="154px"><tspan class="fg-ansi256-012 bold">...</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
</tspan>
- <tspan x="10px" y="172px"><tspan class="fg-ansi256-012 bold">...</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
+ <tspan x="10px" y="172px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> ),</tspan>
</tspan>
- <tspan x="10px" y="190px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
+ <tspan x="10px" y="190px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|_________-</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">this is found to be of type `()`</tspan>
</tspan>
- <tspan x="10px" y="208px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> ),</tspan>
+ <tspan x="10px" y="208px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> false => "</tspan>
</tspan>
- <tspan x="10px" y="226px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|_________-</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">this is found to be of type `()`</tspan>
+ <tspan x="10px" y="226px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold"> __________________^</tspan>
</tspan>
- <tspan x="10px" y="244px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> false => "</tspan>
+ <tspan x="10px" y="244px"><tspan class="fg-ansi256-012 bold">...</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
</tspan>
- <tspan x="10px" y="262px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold"> __________________^</tspan>
+ <tspan x="10px" y="262px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan><tspan> ",</tspan>
</tspan>
- <tspan x="10px" y="280px"><tspan class="fg-ansi256-012 bold">...</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
+ <tspan x="10px" y="280px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|_________^</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">expected `()`, found `&str`</tspan>
</tspan>
- <tspan x="10px" y="298px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
+ <tspan x="10px" y="298px">
</tspan>
- <tspan x="10px" y="316px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan><tspan> ",</tspan>
+ <tspan x="10px" y="316px"><tspan class="fg-ansi256-009 bold">error[E0308]</tspan><tspan class="bold">: `match` arms have incompatible types</tspan>
</tspan>
- <tspan x="10px" y="334px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|_________^</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">expected `()`, found `&str`</tspan>
+ <tspan x="10px" y="334px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">--> </tspan><tspan>$DIR/huge_multispan_highlight.rs:216:18</tspan>
</tspan>
- <tspan x="10px" y="352px">
+ <tspan x="10px" y="352px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
</tspan>
- <tspan x="10px" y="370px"><tspan class="fg-ansi256-009 bold">error[E0308]</tspan><tspan class="bold">: `match` arms have incompatible types</tspan>
+ <tspan x="10px" y="370px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> let _ = match true {</tspan>
</tspan>
- <tspan x="10px" y="388px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">--> </tspan><tspan>$DIR/huge_multispan_highlight.rs:216:18</tspan>
+ <tspan x="10px" y="388px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">----------</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">`match` arms have incompatible types</tspan>
</tspan>
- <tspan x="10px" y="406px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
+ <tspan x="10px" y="406px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> true => (</tspan>
</tspan>
- <tspan x="10px" y="424px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> let _ = match true {</tspan>
+ <tspan x="10px" y="424px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold"> _________________-</tspan>
</tspan>
- <tspan x="10px" y="442px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">----------</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">`match` arms have incompatible types</tspan>
+ <tspan x="10px" y="442px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
</tspan>
- <tspan x="10px" y="460px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> true => (</tspan>
+ <tspan x="10px" y="460px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> 1 // last line shown in multispan header</tspan>
</tspan>
- <tspan x="10px" y="478px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold"> _________________-</tspan>
+ <tspan x="10px" y="478px"><tspan class="fg-ansi256-012 bold">...</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
</tspan>
- <tspan x="10px" y="496px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
+ <tspan x="10px" y="496px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> ),</tspan>
</tspan>
- <tspan x="10px" y="514px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> 1 // last line shown in multispan header</tspan>
+ <tspan x="10px" y="514px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|_________-</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">this is found to be of type `{integer}`</tspan>
</tspan>
- <tspan x="10px" y="532px"><tspan class="fg-ansi256-012 bold">...</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
+ <tspan x="10px" y="532px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> false => "</tspan>
</tspan>
- <tspan x="10px" y="550px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
+ <tspan x="10px" y="550px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold"> __________________^</tspan>
</tspan>
- <tspan x="10px" y="568px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> ),</tspan>
+ <tspan x="10px" y="568px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
</tspan>
- <tspan x="10px" y="586px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|_________-</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">this is found to be of type `{integer}`</tspan>
+ <tspan x="10px" y="586px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
</tspan>
- <tspan x="10px" y="604px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> false => "</tspan>
+ <tspan x="10px" y="604px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan><tspan> 1 last line shown in multispan</tspan>
</tspan>
- <tspan x="10px" y="622px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold"> __________________^</tspan>
+ <tspan x="10px" y="622px"><tspan class="fg-ansi256-012 bold">...</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
</tspan>
- <tspan x="10px" y="640px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
+ <tspan x="10px" y="640px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan><tspan> ",</tspan>
</tspan>
- <tspan x="10px" y="658px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
+ <tspan x="10px" y="658px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|_________^</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">expected integer, found `&str`</tspan>
</tspan>
- <tspan x="10px" y="676px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan><tspan> 1 last line shown in multispan</tspan>
+ <tspan x="10px" y="676px">
</tspan>
- <tspan x="10px" y="694px"><tspan class="fg-ansi256-012 bold">...</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
+ <tspan x="10px" y="694px"><tspan class="fg-ansi256-009 bold">error</tspan><tspan class="bold">: aborting due to 2 previous errors</tspan>
</tspan>
- <tspan x="10px" y="712px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan>
+ <tspan x="10px" y="712px">
</tspan>
- <tspan x="10px" y="730px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|</tspan><tspan> ",</tspan>
+ <tspan x="10px" y="730px"><tspan class="bold">For more information about this error, try `rustc --explain E0308`.</tspan>
</tspan>
- <tspan x="10px" y="748px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">|_________^</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">expected integer, found `&str`</tspan>
-</tspan>
- <tspan x="10px" y="766px">
-</tspan>
- <tspan x="10px" y="784px"><tspan class="fg-ansi256-009 bold">error</tspan><tspan class="bold">: aborting due to 2 previous errors</tspan>
-</tspan>
- <tspan x="10px" y="802px">
-</tspan>
- <tspan x="10px" y="820px"><tspan class="bold">For more information about this error, try `rustc --explain E0308`.</tspan>
-</tspan>
- <tspan x="10px" y="838px">
+ <tspan x="10px" y="748px">
</tspan>
</text>
diff --git a/tests/ui/codemap_tests/huge_multispan_highlight.unicode.svg b/tests/ui/codemap_tests/huge_multispan_highlight.unicode.svg
index 4e1a8d14a28d7..36a33b7404264 100644
--- a/tests/ui/codemap_tests/huge_multispan_highlight.unicode.svg
+++ b/tests/ui/codemap_tests/huge_multispan_highlight.unicode.svg
@@ -1,4 +1,4 @@
-<svg width="743px" height="848px" xmlns="http://www.w3.org/2000/svg">
+<svg width="743px" height="758px" xmlns="http://www.w3.org/2000/svg">
<style>
.fg { fill: #AAAAAA }
.bg { background: #000000 }
@@ -33,83 +33,73 @@
</tspan>
<tspan x="10px" y="136px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">┌─────────────────┘</tspan>
</tspan>
- <tspan x="10px" y="154px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> // last line shown in multispan header</tspan>
+ <tspan x="10px" y="154px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">‡</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
</tspan>
- <tspan x="10px" y="172px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">‡</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
+ <tspan x="10px" y="172px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> ),</tspan>
</tspan>
- <tspan x="10px" y="190px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
+ <tspan x="10px" y="190px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">└─────────┘</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">this is found to be of type `()`</tspan>
</tspan>
- <tspan x="10px" y="208px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> ),</tspan>
+ <tspan x="10px" y="208px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> false => "</tspan>
</tspan>
- <tspan x="10px" y="226px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">└─────────┘</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">this is found to be of type `()`</tspan>
+ <tspan x="10px" y="226px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┏━━━━━━━━━━━━━━━━━━┛</tspan>
</tspan>
- <tspan x="10px" y="244px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> false => "</tspan>
+ <tspan x="10px" y="244px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">‡</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
</tspan>
- <tspan x="10px" y="262px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┏━━━━━━━━━━━━━━━━━━┛</tspan>
+ <tspan x="10px" y="262px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan><tspan> ",</tspan>
</tspan>
- <tspan x="10px" y="280px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">‡</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
+ <tspan x="10px" y="280px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">╰╴</tspan><tspan class="fg-ansi256-009 bold">┗━━━━━━━━━┛</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">expected `()`, found `&str`</tspan>
</tspan>
- <tspan x="10px" y="298px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
+ <tspan x="10px" y="298px">
</tspan>
- <tspan x="10px" y="316px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan><tspan> ",</tspan>
+ <tspan x="10px" y="316px"><tspan class="fg-ansi256-009 bold">error[E0308]</tspan><tspan class="bold">: `match` arms have incompatible types</tspan>
</tspan>
- <tspan x="10px" y="334px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">╰╴</tspan><tspan class="fg-ansi256-009 bold">┗━━━━━━━━━┛</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">expected `()`, found `&str`</tspan>
+ <tspan x="10px" y="334px"><tspan> </tspan><tspan class="fg-ansi256-012 bold"> ╭▸ </tspan><tspan>$DIR/huge_multispan_highlight.rs:216:18</tspan>
</tspan>
- <tspan x="10px" y="352px">
+ <tspan x="10px" y="352px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
</tspan>
- <tspan x="10px" y="370px"><tspan class="fg-ansi256-009 bold">error[E0308]</tspan><tspan class="bold">: `match` arms have incompatible types</tspan>
+ <tspan x="10px" y="370px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> let _ = match true {</tspan>
</tspan>
- <tspan x="10px" y="388px"><tspan> </tspan><tspan class="fg-ansi256-012 bold"> ╭▸ </tspan><tspan>$DIR/huge_multispan_highlight.rs:216:18</tspan>
+ <tspan x="10px" y="388px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">──────────</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">`match` arms have incompatible types</tspan>
</tspan>
- <tspan x="10px" y="406px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
+ <tspan x="10px" y="406px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> true => (</tspan>
</tspan>
- <tspan x="10px" y="424px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> let _ = match true {</tspan>
+ <tspan x="10px" y="424px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">┌─────────────────┘</tspan>
</tspan>
- <tspan x="10px" y="442px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">──────────</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">`match` arms have incompatible types</tspan>
+ <tspan x="10px" y="442px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
</tspan>
- <tspan x="10px" y="460px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> true => (</tspan>
+ <tspan x="10px" y="460px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> 1 // last line shown in multispan header</tspan>
</tspan>
- <tspan x="10px" y="478px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">┌─────────────────┘</tspan>
+ <tspan x="10px" y="478px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">‡</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
</tspan>
- <tspan x="10px" y="496px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
+ <tspan x="10px" y="496px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> ),</tspan>
</tspan>
- <tspan x="10px" y="514px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> 1 // last line shown in multispan header</tspan>
+ <tspan x="10px" y="514px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">└─────────┘</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">this is found to be of type `{integer}`</tspan>
</tspan>
- <tspan x="10px" y="532px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">‡</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
+ <tspan x="10px" y="532px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> false => "</tspan>
</tspan>
- <tspan x="10px" y="550px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan>
+ <tspan x="10px" y="550px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┏━━━━━━━━━━━━━━━━━━┛</tspan>
</tspan>
- <tspan x="10px" y="568px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> ),</tspan>
+ <tspan x="10px" y="568px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
</tspan>
- <tspan x="10px" y="586px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">└─────────┘</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">this is found to be of type `{integer}`</tspan>
+ <tspan x="10px" y="586px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
</tspan>
- <tspan x="10px" y="604px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> false => "</tspan>
+ <tspan x="10px" y="604px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan><tspan> 1 last line shown in multispan</tspan>
</tspan>
- <tspan x="10px" y="622px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┏━━━━━━━━━━━━━━━━━━┛</tspan>
+ <tspan x="10px" y="622px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">‡</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
</tspan>
- <tspan x="10px" y="640px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
+ <tspan x="10px" y="640px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan><tspan> ",</tspan>
</tspan>
- <tspan x="10px" y="658px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
+ <tspan x="10px" y="658px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">╰╴</tspan><tspan class="fg-ansi256-009 bold">┗━━━━━━━━━┛</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">expected integer, found `&str`</tspan>
</tspan>
- <tspan x="10px" y="676px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan><tspan> 1 last line shown in multispan</tspan>
+ <tspan x="10px" y="676px">
</tspan>
- <tspan x="10px" y="694px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">‡</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
+ <tspan x="10px" y="694px"><tspan class="fg-ansi256-009 bold">error</tspan><tspan class="bold">: aborting due to 2 previous errors</tspan>
</tspan>
- <tspan x="10px" y="712px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan>
+ <tspan x="10px" y="712px">
</tspan>
- <tspan x="10px" y="730px"><tspan class="fg-ansi256-012 bold">LL</tspan><tspan> </tspan><tspan class="fg-ansi256-012 bold">│</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">┃</tspan><tspan> ",</tspan>
+ <tspan x="10px" y="730px"><tspan class="bold">For more information about this error, try `rustc --explain E0308`.</tspan>
</tspan>
- <tspan x="10px" y="748px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">╰╴</tspan><tspan class="fg-ansi256-009 bold">┗━━━━━━━━━┛</tspan><tspan> </tspan><tspan class="fg-ansi256-009 bold">expected integer, found `&str`</tspan>
-</tspan>
- <tspan x="10px" y="766px">
-</tspan>
- <tspan x="10px" y="784px"><tspan class="fg-ansi256-009 bold">error</tspan><tspan class="bold">: aborting due to 2 previous errors</tspan>
-</tspan>
- <tspan x="10px" y="802px">
-</tspan>
- <tspan x="10px" y="820px"><tspan class="bold">For more information about this error, try `rustc --explain E0308`.</tspan>
-</tspan>
- <tspan x="10px" y="838px">
+ <tspan x="10px" y="748px">
</tspan>
</text>
diff --git a/tests/ui/coercion/coerce-loop-issue-122561.stderr b/tests/ui/coercion/coerce-loop-issue-122561.stderr
index 90e9f41c29108..3af7e7cddb31d 100644
--- a/tests/ui/coercion/coerce-loop-issue-122561.stderr
+++ b/tests/ui/coercion/coerce-loop-issue-122561.stderr
@@ -189,8 +189,7 @@ error[E0308]: mismatched types
LL | fn while_never_type() -> ! {
| - expected `!` because of return type
LL | / while true {
-LL | |
-LL | |
+... |
LL | | }
| |_____^ expected `!`, found `()`
|
diff --git a/tests/ui/const-generics/early/const_arg_trivial_macro_expansion-2.stderr b/tests/ui/const-generics/early/const_arg_trivial_macro_expansion-2.stderr
index a3211b7762394..58d42d82998bf 100644
--- a/tests/ui/const-generics/early/const_arg_trivial_macro_expansion-2.stderr
+++ b/tests/ui/const-generics/early/const_arg_trivial_macro_expansion-2.stderr
@@ -2,10 +2,7 @@ error: free constant item without body
--> $DIR/const_arg_trivial_macro_expansion-2.rs:12:1
|
LL | / const _: A<
-LL | |
-LL | |
-LL | | {
-LL | | y! { test.tou8 }
+... |
LL | | },
LL | | >;
| | ^ help: provide a definition for the constant: `= <expr>;`
diff --git a/tests/ui/const-generics/issues/issue-67945-2.full.stderr b/tests/ui/const-generics/issues/issue-67945-2.full.stderr
index 837927d588c7e..1eca3261a4aee 100644
--- a/tests/ui/const-generics/issues/issue-67945-2.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-2.full.stderr
@@ -5,8 +5,7 @@ LL | A: [(); {
| _____________^
LL | |
LL | | let x: Option<Box<Self>> = None;
-LL | |
-LL | | 0
+... |
LL | | }],
| |_____^ blocks are not supported in generic constants
|
diff --git a/tests/ui/const-generics/issues/issue-71202.stderr b/tests/ui/const-generics/issues/issue-71202.stderr
index a2d382218526e..cc3603d1145c3 100644
--- a/tests/ui/const-generics/issues/issue-71202.stderr
+++ b/tests/ui/const-generics/issues/issue-71202.stderr
@@ -4,7 +4,6 @@ error: unconstrained generic constant
LL | / const ITEM_IS_COPY: [(); 1 - {
LL | | trait NotCopy {
LL | | const VALUE: bool = false;
-LL | | }
... |
LL | | <IsCopy<T>>::VALUE
LL | | } as usize] = [];
diff --git a/tests/ui/const-generics/nested-type.min.stderr b/tests/ui/const-generics/nested-type.min.stderr
index 8696be3faf37b..cdc0b9807d937 100644
--- a/tests/ui/const-generics/nested-type.min.stderr
+++ b/tests/ui/const-generics/nested-type.min.stderr
@@ -25,7 +25,6 @@ LL | | struct Foo<const N: usize>;
LL | |
LL | | impl<const N: usize> Foo<N> {
... |
-LL | |
LL | | }]>;
| |__^
|
diff --git a/tests/ui/consts/const-eval/infinite_loop.eval_limit.stderr b/tests/ui/consts/const-eval/infinite_loop.eval_limit.stderr
index d664ae8832325..f326da8e26af5 100644
--- a/tests/ui/consts/const-eval/infinite_loop.eval_limit.stderr
+++ b/tests/ui/consts/const-eval/infinite_loop.eval_limit.stderr
@@ -16,7 +16,6 @@ LL | let s = [(); {
| __________________^
LL | | let mut n = 113383; // #20 in https://oeis.org/A006884
LL | | while n != 0 {
-LL | |
... |
LL | | n
LL | | }];
diff --git a/tests/ui/consts/const-eval/infinite_loop.no_ice.stderr b/tests/ui/consts/const-eval/infinite_loop.no_ice.stderr
index d664ae8832325..f326da8e26af5 100644
--- a/tests/ui/consts/const-eval/infinite_loop.no_ice.stderr
+++ b/tests/ui/consts/const-eval/infinite_loop.no_ice.stderr
@@ -16,7 +16,6 @@ LL | let s = [(); {
| __________________^
LL | | let mut n = 113383; // #20 in https://oeis.org/A006884
LL | | while n != 0 {
-LL | |
... |
LL | | n
LL | | }];
diff --git a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.allow.stderr b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.allow.stderr
index 7f6625bcfcdc6..dddd79a43838f 100644
--- a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.allow.stderr
+++ b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.allow.stderr
@@ -2,10 +2,7 @@ warning: constant evaluation is taking a long time
--> $DIR/ctfe-simple-loop.rs:10:5
|
LL | / while index < n {
-LL | |
-LL | |
-LL | |
-LL | | index = index + 1;
+... |
LL | | }
| |_____^ the const evaluator is currently interpreting this expression
|
diff --git a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.warn.stderr b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.warn.stderr
index 657f0e5bcba40..2bb9a8a98ec4d 100644
--- a/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.warn.stderr
+++ b/tests/ui/consts/const-eval/stable-metric/ctfe-simple-loop.warn.stderr
@@ -2,10 +2,7 @@ warning: constant evaluation is taking a long time
--> $DIR/ctfe-simple-loop.rs:10:5
|
LL | / while index < n {
-LL | |
-LL | |
-LL | |
-LL | | index = index + 1;
+... |
LL | | }
| |_____^
|
@@ -26,10 +23,7 @@ warning: constant evaluation is taking a long time
--> $DIR/ctfe-simple-loop.rs:10:5
|
LL | / while index < n {
-LL | |
-LL | |
-LL | |
-LL | | index = index + 1;
+... |
LL | | }
| |_____^
|
@@ -45,10 +39,7 @@ warning: constant evaluation is taking a long time
--> $DIR/ctfe-simple-loop.rs:10:5
|
LL | / while index < n {
-LL | |
-LL | |
-LL | |
-LL | | index = index + 1;
+... |
LL | | }
| |_____^ the const evaluator is currently interpreting this expression
|
diff --git a/tests/ui/consts/const-eval/stable-metric/evade-deduplication-issue-118612.stderr b/tests/ui/consts/const-eval/stable-metric/evade-deduplication-issue-118612.stderr
index cb19c59b15bc0..f41d2ea3e623d 100644
--- a/tests/ui/consts/const-eval/stable-metric/evade-deduplication-issue-118612.stderr
+++ b/tests/ui/consts/const-eval/stable-metric/evade-deduplication-issue-118612.stderr
@@ -2,11 +2,7 @@ warning: constant evaluation is taking a long time
--> $DIR/evade-deduplication-issue-118612.rs:8:5
|
LL | / loop {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_____^ the const evaluator is currently interpreting this expression
|
@@ -20,11 +16,7 @@ warning: constant evaluation is taking a long time
--> $DIR/evade-deduplication-issue-118612.rs:8:5
|
LL | / loop {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_____^ the const evaluator is currently interpreting this expression
|
@@ -38,11 +30,7 @@ warning: constant evaluation is taking a long time
--> $DIR/evade-deduplication-issue-118612.rs:8:5
|
LL | / loop {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_____^ the const evaluator is currently interpreting this expression
|
@@ -56,11 +44,7 @@ warning: constant evaluation is taking a long time
--> $DIR/evade-deduplication-issue-118612.rs:8:5
|
LL | / loop {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_____^ the const evaluator is currently interpreting this expression
|
@@ -74,11 +58,7 @@ warning: constant evaluation is taking a long time
--> $DIR/evade-deduplication-issue-118612.rs:8:5
|
LL | / loop {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_____^ the const evaluator is currently interpreting this expression
|
diff --git a/tests/ui/coroutine/drop-tracking-parent-expression.stderr b/tests/ui/coroutine/drop-tracking-parent-expression.stderr
index 51fc20070bfda..dc2f9768d234e 100644
--- a/tests/ui/coroutine/drop-tracking-parent-expression.stderr
+++ b/tests/ui/coroutine/drop-tracking-parent-expression.stderr
@@ -7,7 +7,6 @@ LL | assert_send(g);
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -26,7 +25,6 @@ LL | _ => yield,
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -47,7 +45,6 @@ LL | assert_send(g);
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -66,7 +63,6 @@ LL | _ => yield,
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -87,7 +83,6 @@ LL | assert_send(g);
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -106,7 +101,6 @@ LL | _ => yield,
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
diff --git a/tests/ui/coroutine/issue-88653.stderr b/tests/ui/coroutine/issue-88653.stderr
index ef0cc11dde8e8..772a7f8424a50 100644
--- a/tests/ui/coroutine/issue-88653.stderr
+++ b/tests/ui/coroutine/issue-88653.stderr
@@ -12,8 +12,7 @@ LL | |bar| {
LL | |
LL | |
LL | | if bar {
-LL | | yield bar;
-LL | | }
+... |
LL | | }
| |_____- return type was inferred to be `{coroutine@$DIR/issue-88653.rs:15:5: 15:10}` here
|
diff --git a/tests/ui/coroutine/match-bindings.stderr b/tests/ui/coroutine/match-bindings.stderr
index 5525bfed1165b..1318e6931f550 100644
--- a/tests/ui/coroutine/match-bindings.stderr
+++ b/tests/ui/coroutine/match-bindings.stderr
@@ -7,7 +7,6 @@ LL | | loop {
LL | | if let true = true {
LL | | match Enum::A(String::new()) {
... |
-LL | | }
LL | | };
| |_____^
|
diff --git a/tests/ui/coroutine/parent-expression.stderr b/tests/ui/coroutine/parent-expression.stderr
index 770ffda7a262f..a9125772b5ad1 100644
--- a/tests/ui/coroutine/parent-expression.stderr
+++ b/tests/ui/coroutine/parent-expression.stderr
@@ -7,7 +7,6 @@ LL | assert_send(g);
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -26,7 +25,6 @@ LL | _ => yield,
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -47,7 +45,6 @@ LL | assert_send(g);
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -66,7 +63,6 @@ LL | _ => yield,
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -87,7 +83,6 @@ LL | assert_send(g);
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
@@ -106,7 +101,6 @@ LL | _ => yield,
LL | / type_combinations!(
LL | | // OK
LL | | copy => { #[derive(Copy, Clone, Default)] pub struct Client; };
-LL | | // NOT OK: MIR borrowck thinks that this is used after the yield, even though
... |
LL | | };
LL | | );
diff --git a/tests/ui/coroutine/too-live-local-in-immovable-gen.stderr b/tests/ui/coroutine/too-live-local-in-immovable-gen.stderr
index 48df5c5beacd7..4fad40363001b 100644
--- a/tests/ui/coroutine/too-live-local-in-immovable-gen.stderr
+++ b/tests/ui/coroutine/too-live-local-in-immovable-gen.stderr
@@ -3,9 +3,6 @@ warning: unused coroutine that must be used
|
LL | #[coroutine] static move || {
| ______________________^
-LL | | // Tests that the coroutine transformation finds out that `a` is not live
-LL | | // during the yield expression. Type checking will also compute liveness
-LL | | // and it should also find out that `a` is not live.
... |
LL | | let _ = &a;
LL | | };
diff --git a/tests/ui/coroutine/yield-in-initializer.stderr b/tests/ui/coroutine/yield-in-initializer.stderr
index 1e22b7876687f..eff5a0fdccffe 100644
--- a/tests/ui/coroutine/yield-in-initializer.stderr
+++ b/tests/ui/coroutine/yield-in-initializer.stderr
@@ -4,10 +4,7 @@ warning: unused coroutine that must be used
LL | #[coroutine] static || {
| __________________^
LL | | loop {
-LL | | // Test that `opt` is not live across the yield, even when borrowed in a loop
-LL | | // See https://github.com/rust-lang/rust/issues/52792
... |
-LL | | }
LL | | };
| |_____^
|
diff --git a/tests/ui/coverage-attr/name-value.stderr b/tests/ui/coverage-attr/name-value.stderr
index 986467dda698e..38101764d6f99 100644
--- a/tests/ui/coverage-attr/name-value.stderr
+++ b/tests/ui/coverage-attr/name-value.stderr
@@ -171,8 +171,6 @@ LL | #[coverage = "off"]
...
LL | / trait MyTrait {
LL | | #[coverage = "off"]
-LL | |
-LL | |
... |
LL | | type T;
LL | | }
diff --git a/tests/ui/coverage-attr/word-only.stderr b/tests/ui/coverage-attr/word-only.stderr
index 1ce149724c6f4..154ea61f3a3da 100644
--- a/tests/ui/coverage-attr/word-only.stderr
+++ b/tests/ui/coverage-attr/word-only.stderr
@@ -171,8 +171,6 @@ LL | #[coverage]
...
LL | / trait MyTrait {
LL | | #[coverage]
-LL | |
-LL | |
... |
LL | | type T;
LL | | }
diff --git a/tests/ui/diagnostic-width/E0271.ascii.stderr b/tests/ui/diagnostic-width/E0271.ascii.stderr
index e276299e9e8ef..7446b1a543e70 100644
--- a/tests/ui/diagnostic-width/E0271.ascii.stderr
+++ b/tests/ui/diagnostic-width/E0271.ascii.stderr
@@ -6,7 +6,6 @@ LL | | Ok::<_, ()>(
LL | | Err::<(), _>(
LL | | Ok::<_, ()>(
... |
-LL | | )
LL | | )
| |_____^ type mismatch resolving `<Result<Result<(), Result<Result<(), ...>, ...>>, ...> as Future>::Error == Foo`
|
diff --git a/tests/ui/diagnostic-width/E0271.unicode.stderr b/tests/ui/diagnostic-width/E0271.unicode.stderr
index 4a96ca36cd78d..72df2a381a422 100644
--- a/tests/ui/diagnostic-width/E0271.unicode.stderr
+++ b/tests/ui/diagnostic-width/E0271.unicode.stderr
@@ -6,7 +6,6 @@ LL │ ┃ Ok::<_, ()>(
LL │ ┃ Err::<(), _>(
LL │ ┃ Ok::<_, ()>(
‡ ┃
-LL │ ┃ )
LL │ ┃ )
│ ┗━━━━━┛ type mismatch resolving `<Result<Result<(), Result<Result<(), ...>, ...>>, ...> as Future>::Error == Foo`
╰╴
diff --git a/tests/ui/drop/lint-tail-expr-drop-order.stderr b/tests/ui/drop/lint-tail-expr-drop-order.stderr
index f0da24605e64c..a3084f660e46a 100644
--- a/tests/ui/drop/lint-tail-expr-drop-order.stderr
+++ b/tests/ui/drop/lint-tail-expr-drop-order.stderr
@@ -22,22 +22,14 @@ note: `#1` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
note: `x` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
@@ -71,22 +63,14 @@ note: `#1` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
note: `x` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
@@ -115,22 +99,14 @@ note: `#1` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
note: `x` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
@@ -159,22 +135,14 @@ note: `#1` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
note: `future` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
@@ -225,22 +193,14 @@ note: `#1` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
note: `x` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
@@ -311,22 +271,14 @@ note: `#1` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
note: `_x` invokes this custom destructor
--> $DIR/lint-tail-expr-drop-order.rs:11:1
|
LL | / impl Drop for LoudDropper {
-LL | |
-LL | |
-LL | |
... |
-LL | | }
LL | | }
| |_^
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
diff --git a/tests/ui/errors/issue-89280-emitter-overflow-splice-lines.stderr b/tests/ui/errors/issue-89280-emitter-overflow-splice-lines.stderr
index 08eb8cfac49ce..54bde98b57f9f 100644
--- a/tests/ui/errors/issue-89280-emitter-overflow-splice-lines.stderr
+++ b/tests/ui/errors/issue-89280-emitter-overflow-splice-lines.stderr
@@ -3,8 +3,7 @@ warning: anonymous parameters are deprecated and will be removed in the next edi
|
LL | fn test(x: u32, (
| _____________________^
-LL | |
-LL | |
+... |
LL | | )) {}
| |_____^
|
diff --git a/tests/ui/expr/if/if-let-arm-types.stderr b/tests/ui/expr/if/if-let-arm-types.stderr
index 285f5c4a6f222..0a8260f0fea3e 100644
--- a/tests/ui/expr/if/if-let-arm-types.stderr
+++ b/tests/ui/expr/if/if-let-arm-types.stderr
@@ -5,8 +5,7 @@ LL | / if let Some(b) = None {
LL | |
LL | | ()
| | -- expected because of this
-LL | |
-LL | | } else {
+... |
LL | | 1
| | ^ expected `()`, found integer
LL | | };
diff --git a/tests/ui/extern/issue-116203.stderr b/tests/ui/extern/issue-116203.stderr
index 86e4cc763bd6e..51ef1421e3e60 100644
--- a/tests/ui/extern/issue-116203.stderr
+++ b/tests/ui/extern/issue-116203.stderr
@@ -22,8 +22,7 @@ LL | extern "C" {
LL | / thread_local! {
LL | | static FOO: u32 = 0;
| | ^^^ cannot have a body
-LL | |
-LL | |
+... |
LL | | }
| |_____- the invalid body
|
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
index fe764ff49255e..db8c5295a2daa 100644
--- a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
@@ -54,11 +54,7 @@ LL | #[inline]
| ^^^^^^^^^
LL |
LL | / mod inline {
-LL | |
-LL | |
-LL | |
... |
-LL | |
LL | | }
| |_- not a function or closure
@@ -73,7 +69,6 @@ LL | |
LL | |
LL | | mod inner { #![no_link] }
... |
-LL | |
LL | | }
| |_- not an `extern crate` item
@@ -88,7 +83,6 @@ LL | |
LL | |
LL | | mod inner { #![export_name="2200"] }
... |
-LL | | }
LL | | }
| |_- not a free function, impl method or static
@@ -101,9 +95,7 @@ LL |
LL | / mod repr {
LL | |
LL | | mod inner { #![repr(C)] }
-LL | |
... |
-LL | |
LL | | }
| |_- not a struct, enum, or union
@@ -116,9 +108,7 @@ LL |
LL | / mod repr_rust {
LL | |
LL | | mod inner { #![repr(Rust)] }
-LL | |
... |
-LL | |
LL | | }
| |_- not a struct, enum, or union
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
index e43cef7c15078..18fb75aafbb3f 100644
--- a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
@@ -227,9 +227,7 @@ LL | #[no_mangle]
LL | / mod no_mangle {
LL | |
LL | | mod inner { #![no_mangle] }
-LL | |
... |
-LL | | }
LL | | }
| |_- not a free function, impl method or static
|
@@ -270,7 +268,6 @@ LL | |
LL | |
LL | | mod inner { #![cold] }
... |
-LL | |
LL | | }
| |_- not a function definition
|
@@ -287,7 +284,6 @@ LL | |
LL | |
LL | | #[link_name = "1900"]
... |
-LL | |
LL | | }
| |_- not a foreign function or static
|
@@ -304,7 +300,6 @@ LL | |
LL | |
LL | | mod inner { #![link_section="1800"] }
... |
-LL | |
LL | | }
| |_- not a function or static
|
@@ -321,7 +316,6 @@ LL | |
LL | |
LL | | mod inner { #![link()] }
... |
-LL | |
LL | | }
| |_- not an `extern` block
|
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-derive.stderr b/tests/ui/feature-gates/issue-43106-gating-of-derive.stderr
index 4dee7a00544e4..5df3e9e73fe9d 100644
--- a/tests/ui/feature-gates/issue-43106-gating-of-derive.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-derive.stderr
@@ -6,8 +6,6 @@ LL | #[derive(Debug)]
LL |
LL | / mod derive {
LL | | mod inner { #![derive(Debug)] }
-LL | |
-LL | |
... |
LL | | impl S { }
LL | | }
diff --git a/tests/ui/for/for-else-err.stderr b/tests/ui/for/for-else-err.stderr
index bd49dc4724450..a872cde5cac61 100644
--- a/tests/ui/for/for-else-err.stderr
+++ b/tests/ui/for/for-else-err.stderr
@@ -6,8 +6,7 @@ LL | for _ in 0..1 {
LL |
LL | } else {
| _______^
-LL | |
-LL | |
+... |
LL | | }
| |_____^
|
diff --git a/tests/ui/for/for-else-let-else-err.stderr b/tests/ui/for/for-else-let-else-err.stderr
index bb6558739ba75..22432a18bbb8e 100644
--- a/tests/ui/for/for-else-let-else-err.stderr
+++ b/tests/ui/for/for-else-let-else-err.stderr
@@ -6,8 +6,7 @@ LL | let _ = for _ in 0..1 {
LL |
LL | } else {
| _______^
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/generic-associated-types/collectivity-regression.stderr b/tests/ui/generic-associated-types/collectivity-regression.stderr
index 0c395a1664f0d..1c081ac644afa 100644
--- a/tests/ui/generic-associated-types/collectivity-regression.stderr
+++ b/tests/ui/generic-associated-types/collectivity-regression.stderr
@@ -2,10 +2,7 @@ error: `T` does not live long enough
--> $DIR/collectivity-regression.rs:13:5
|
LL | / || {
-LL | |
-LL | | //
-LL | | // FIXME(#98437). This regressed at some point and
-LL | | // probably should work.
+... |
LL | | let _x = x;
LL | | };
| |_____^
diff --git a/tests/ui/generics/overlapping-errors-span-issue-123861.rs b/tests/ui/generics/overlapping-errors-span-issue-123861.rs
new file mode 100644
index 0000000000000..e0a27f6874874
--- /dev/null
+++ b/tests/ui/generics/overlapping-errors-span-issue-123861.rs
@@ -0,0 +1,8 @@
+fn mainIterator<_ = _> {}
+//~^ ERROR expected identifier, found reserved identifier `_`
+//~| ERROR missing parameters for function definition
+//~| ERROR defaults for type parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions [invalid_type_param_default]
+//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+//~| ERROR the placeholder `_` is not allowed within types on item signatures for functions [E0121]
+
+fn main() {}
diff --git a/tests/ui/generics/overlapping-errors-span-issue-123861.stderr b/tests/ui/generics/overlapping-errors-span-issue-123861.stderr
new file mode 100644
index 0000000000000..e0a49343b0e0d
--- /dev/null
+++ b/tests/ui/generics/overlapping-errors-span-issue-123861.stderr
@@ -0,0 +1,52 @@
+error: expected identifier, found reserved identifier `_`
+ --> $DIR/overlapping-errors-span-issue-123861.rs:1:17
+ |
+LL | fn mainIterator<_ = _> {}
+ | ^ expected identifier, found reserved identifier
+
+error: missing parameters for function definition
+ --> $DIR/overlapping-errors-span-issue-123861.rs:1:23
+ |
+LL | fn mainIterator<_ = _> {}
+ | ^
+ |
+help: add a parameter list
+ |
+LL | fn mainIterator<_ = _>() {}
+ | ++
+
+error: defaults for type parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
+ --> $DIR/overlapping-errors-span-issue-123861.rs:1:17
+ |
+LL | fn mainIterator<_ = _> {}
+ | ^^^^^
+ |
+ = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+ = note: for more information, see issue #36887 <https://github.com/rust-lang/rust/issues/36887>
+ = note: `#[deny(invalid_type_param_default)]` on by default
+
+error[E0121]: the placeholder `_` is not allowed within types on item signatures for functions
+ --> $DIR/overlapping-errors-span-issue-123861.rs:1:21
+ |
+LL | fn mainIterator<_ = _> {}
+ | ^ not allowed in type signatures
+ |
+help: use type parameters instead
+ |
+LL | fn mainIterator<T = T> {}
+ | ~ ~
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0121`.
+Future incompatibility report: Future breakage diagnostic:
+error: defaults for type parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
+ --> $DIR/overlapping-errors-span-issue-123861.rs:1:17
+ |
+LL | fn mainIterator<_ = _> {}
+ | ^^^^^
+ |
+ = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+ = note: for more information, see issue #36887 <https://github.com/rust-lang/rust/issues/36887>
+ = note: `#[deny(invalid_type_param_default)]` on by default
+
diff --git a/tests/ui/impl-trait/in-trait/false-positive-predicate-entailment-error.current.stderr b/tests/ui/impl-trait/in-trait/false-positive-predicate-entailment-error.current.stderr
index 1ddbd75142f9c..e38e18857ef66 100644
--- a/tests/ui/impl-trait/in-trait/false-positive-predicate-entailment-error.current.stderr
+++ b/tests/ui/impl-trait/in-trait/false-positive-predicate-entailment-error.current.stderr
@@ -2,9 +2,6 @@ error[E0277]: the trait bound `F: MyFn<i32>` is not satisfied
--> $DIR/false-positive-predicate-entailment-error.rs:36:5
|
LL | / fn autobatch<F>(self) -> impl Trait
-LL | |
-LL | |
-LL | |
... |
LL | | where
LL | | F: Callback<Self::CallbackArg>,
@@ -52,9 +49,6 @@ error[E0277]: the trait bound `F: MyFn<i32>` is not satisfied
--> $DIR/false-positive-predicate-entailment-error.rs:36:5
|
LL | / fn autobatch<F>(self) -> impl Trait
-LL | |
-LL | |
-LL | |
... |
LL | | where
LL | | F: Callback<Self::CallbackArg>,
@@ -105,9 +99,6 @@ error[E0277]: the trait bound `F: MyFn<i32>` is not satisfied
--> $DIR/false-positive-predicate-entailment-error.rs:36:5
|
LL | / fn autobatch<F>(self) -> impl Trait
-LL | |
-LL | |
-LL | |
... |
LL | | where
LL | | F: Callback<Self::CallbackArg>,
diff --git a/tests/ui/issues/issue-18611.stderr b/tests/ui/issues/issue-18611.stderr
index 76848201f7327..918654215b372 100644
--- a/tests/ui/issues/issue-18611.stderr
+++ b/tests/ui/issues/issue-18611.stderr
@@ -15,8 +15,7 @@ error[E0277]: the trait bound `isize: HasState` is not satisfied
|
LL | fn add_state(op: <isize as HasState>::State) {
| ______________________________________________^
-LL | |
-LL | |
+... |
LL | | }
| |_^ the trait `HasState` is not implemented for `isize`
|
diff --git a/tests/ui/issues/issue-51714.stderr b/tests/ui/issues/issue-51714.stderr
index e53e10afcafaa..da3e3caea29a3 100644
--- a/tests/ui/issues/issue-51714.stderr
+++ b/tests/ui/issues/issue-51714.stderr
@@ -2,14 +2,10 @@ error[E0572]: return statement outside of function body
--> $DIR/issue-51714.rs:6:13
|
LL | / fn main() {
-LL | |
-LL | |
-LL | |
-LL | |
+... |
LL | | |_: [_; return || {}]| {};
| | ^^^^^^^^^^^^ the return is part of this body...
... |
-LL | |
LL | | }
| |_- ...not the enclosing function body
@@ -17,14 +13,10 @@ error[E0572]: return statement outside of function body
--> $DIR/issue-51714.rs:10:10
|
LL | / fn main() {
-LL | |
-LL | |
-LL | |
... |
LL | | [(); return || {}];
| | ^^^^^^^^^^^^ the return is part of this body...
... |
-LL | |
LL | | }
| |_- ...not the enclosing function body
@@ -32,14 +24,10 @@ error[E0572]: return statement outside of function body
--> $DIR/issue-51714.rs:14:10
|
LL | / fn main() {
-LL | |
-LL | |
-LL | |
... |
LL | | [(); return |ice| {}];
| | ^^^^^^^^^^^^^^^ the return is part of this body...
... |
-LL | |
LL | | }
| |_- ...not the enclosing function body
@@ -47,14 +35,10 @@ error[E0572]: return statement outside of function body
--> $DIR/issue-51714.rs:18:10
|
LL | / fn main() {
-LL | |
-LL | |
-LL | |
... |
LL | | [(); return while let Some(n) = Some(0) {}];
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the return is part of this body...
-LL | |
-LL | |
+... |
LL | | }
| |_- ...not the enclosing function body
diff --git a/tests/ui/lifetimes/issue-76168-hr-outlives-3.stderr b/tests/ui/lifetimes/issue-76168-hr-outlives-3.stderr
index e8c3ab00226e1..90572fed0ed92 100644
--- a/tests/ui/lifetimes/issue-76168-hr-outlives-3.stderr
+++ b/tests/ui/lifetimes/issue-76168-hr-outlives-3.stderr
@@ -2,9 +2,6 @@ error[E0277]: expected a `FnOnce(&'a mut i32)` closure, found `i32`
--> $DIR/issue-76168-hr-outlives-3.rs:6:1
|
LL | / async fn wrapper<F>(f: F)
-LL | |
-LL | |
-LL | |
... |
LL | | F:,
LL | | for<'a> <i32 as FnOnce<(&'a mut i32,)>>::Output: Future<Output = ()> + 'a,
@@ -24,9 +21,6 @@ error[E0277]: expected a `FnOnce(&'a mut i32)` closure, found `i32`
--> $DIR/issue-76168-hr-outlives-3.rs:6:1
|
LL | / async fn wrapper<F>(f: F)
-LL | |
-LL | |
-LL | |
... |
LL | | F:,
LL | | for<'a> <i32 as FnOnce<(&'a mut i32,)>>::Output: Future<Output = ()> + 'a,
@@ -38,9 +32,6 @@ error[E0277]: expected a `FnOnce(&'a mut i32)` closure, found `i32`
--> $DIR/issue-76168-hr-outlives-3.rs:6:1
|
LL | / async fn wrapper<F>(f: F)
-LL | |
-LL | |
-LL | |
... |
LL | | F:,
LL | | for<'a> <i32 as FnOnce<(&'a mut i32,)>>::Output: Future<Output = ()> + 'a,
diff --git a/tests/ui/lifetimes/issue-97194.stderr b/tests/ui/lifetimes/issue-97194.stderr
index 93bde285a9901..345e21cb2507e 100644
--- a/tests/ui/lifetimes/issue-97194.stderr
+++ b/tests/ui/lifetimes/issue-97194.stderr
@@ -7,10 +7,7 @@ LL | fn bget(&self, index: [usize; Self::DIM]) -> bool {
| ________^^^^___________________________________________-
| | |
| | cannot have a body
-LL | |
-LL | |
-LL | |
-LL | | type T<'a> = &'a str;
+... |
LL | | }
| |_____- help: remove the invalid body: `;`
|
diff --git a/tests/ui/lint/lints-in-foreign-macros.stderr b/tests/ui/lint/lints-in-foreign-macros.stderr
index f20e16287af0f..c0164bd00ffff 100644
--- a/tests/ui/lint/lints-in-foreign-macros.stderr
+++ b/tests/ui/lint/lints-in-foreign-macros.stderr
@@ -34,7 +34,6 @@ LL | | #![warn(missing_docs)]
LL | |
LL | | #[macro_use]
... |
-LL | |
LL | | fn main() {}
| |____________^
|
diff --git a/tests/ui/lint/non-local-defs/consts.stderr b/tests/ui/lint/non-local-defs/consts.stderr
index 20fb4a6432e4e..077837f4a6b27 100644
--- a/tests/ui/lint/non-local-defs/consts.stderr
+++ b/tests/ui/lint/non-local-defs/consts.stderr
@@ -124,7 +124,6 @@ LL | | impl Uto10 for Test {}
| | | |
| | | `Test` is not local
| | `Uto10` is not local
-LL | |
... |
LL | | }];
| |_____- move the `impl` block outside of this constant expression `<unnameable>` and up 2 bodies
diff --git a/tests/ui/lint/non-local-defs/weird-exprs.stderr b/tests/ui/lint/non-local-defs/weird-exprs.stderr
index ec3517140ef2e..5b7d1a837444e 100644
--- a/tests/ui/lint/non-local-defs/weird-exprs.stderr
+++ b/tests/ui/lint/non-local-defs/weird-exprs.stderr
@@ -8,7 +8,6 @@ LL | | impl Uto for *mut Test {}
| | | |
| | | `Test` is not local
| | `Uto` is not local
-LL | |
... |
LL | | }];
| |_- move the `impl` block outside of this constant expression `<unnameable>`
@@ -26,7 +25,6 @@ LL | | impl Uto for Test {}
| | | |
| | | `Test` is not local
| | `Uto` is not local
-LL | |
... |
LL | | }
| |_____- move the `impl` block outside of this constant expression `<unnameable>`
@@ -61,7 +59,6 @@ LL | | impl Uto for &Test {}
| | | |
| | | `Test` is not local
| | `Uto` is not local
-LL | |
... |
LL | | }];
| |_____- move the `impl` block outside of this constant expression `<unnameable>` and up 2 bodies
@@ -78,7 +75,6 @@ LL | | impl Uto for &(Test,) {}
| | | |
| | | `Test` is not local
| | `Uto` is not local
-LL | |
... |
LL | | }]) {}
| |_____- move the `impl` block outside of this constant expression `<unnameable>` and up 2 bodies
@@ -96,7 +92,6 @@ LL | | impl Uto for &(Test,Test) {}
| | | | `Test` is not local
| | | `Test` is not local
| | `Uto` is not local
-LL | |
... |
LL | | }] { todo!() }
| |_____- move the `impl` block outside of this constant expression `<unnameable>` and up 2 bodies
diff --git a/tests/ui/loops/dont-suggest-break-thru-item.stderr b/tests/ui/loops/dont-suggest-break-thru-item.stderr
index 642578ade60bf..e7ed7ae15015e 100644
--- a/tests/ui/loops/dont-suggest-break-thru-item.stderr
+++ b/tests/ui/loops/dont-suggest-break-thru-item.stderr
@@ -4,8 +4,7 @@ error[E0308]: mismatched types
LL | / if true {
LL | | Err(1)
| | ^^^^^^ expected `()`, found `Result<_, {integer}>`
-LL | |
-LL | |
+... |
LL | | }
| |_____________- expected this to be `()`
|
@@ -22,8 +21,7 @@ error[E0308]: mismatched types
LL | / if true {
LL | | Err(1)
| | ^^^^^^ expected `()`, found `Result<_, {integer}>`
-LL | |
-LL | |
+... |
LL | | }
| |_____________- expected this to be `()`
|
diff --git a/tests/ui/loops/loop-else-err.stderr b/tests/ui/loops/loop-else-err.stderr
index c1cbd544afde2..36ccd9c4047a7 100644
--- a/tests/ui/loops/loop-else-err.stderr
+++ b/tests/ui/loops/loop-else-err.stderr
@@ -6,8 +6,7 @@ LL | loop {
LL |
LL | } else {
| _______^
-LL | |
-LL | |
+... |
LL | | }
| |_____^
|
diff --git a/tests/ui/loops/loop-else-let-else-err.stderr b/tests/ui/loops/loop-else-let-else-err.stderr
index 6ee77fb47af33..b2d07d4b2b20f 100644
--- a/tests/ui/loops/loop-else-let-else-err.stderr
+++ b/tests/ui/loops/loop-else-let-else-err.stderr
@@ -6,8 +6,7 @@ LL | let _ = loop {
LL |
LL | } else {
| _______^
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/lub-glb/old-lub-glb-hr-noteq1.leak.stderr b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.leak.stderr
index 10e3fc9286895..747d492999c1e 100644
--- a/tests/ui/lub-glb/old-lub-glb-hr-noteq1.leak.stderr
+++ b/tests/ui/lub-glb/old-lub-glb-hr-noteq1.leak.stderr
@@ -7,8 +7,7 @@ LL | | 0 => x,
| | - this is found to be of type `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
LL | | _ => y,
| | ^ one type is more general than the other
-LL | |
-LL | |
+... |
LL | | };
| |_____- `match` arms have incompatible types
|
diff --git a/tests/ui/match/match-incompat-type-semi.stderr b/tests/ui/match/match-incompat-type-semi.stderr
index 008b1c1e93d6d..ca5336602c7e8 100644
--- a/tests/ui/match/match-incompat-type-semi.stderr
+++ b/tests/ui/match/match-incompat-type-semi.stderr
@@ -31,8 +31,7 @@ LL | | 0;
| | ||
| | |help: consider removing this semicolon
| | expected integer, found `()`
-LL | |
-LL | |
+... |
LL | | };
| |_____- `if` and `else` have incompatible types
diff --git a/tests/ui/match/match-type-err-first-arm.stderr b/tests/ui/match/match-type-err-first-arm.stderr
index 1cfe7ce1ed726..69f4e22e6aeda 100644
--- a/tests/ui/match/match-type-err-first-arm.stderr
+++ b/tests/ui/match/match-type-err-first-arm.stderr
@@ -21,8 +21,7 @@ LL | | 12 => 'b',
| | --- this is found to be of type `char`
LL | | _ => 42,
| | ^^ expected `char`, found integer
-LL | |
-LL | |
+... |
LL | | };
| |_____- `match` arms have incompatible types
@@ -40,8 +39,7 @@ LL | | 6 => 'b',
LL | |
LL | | _ => 42,
| | ^^ expected `char`, found integer
-LL | |
-LL | |
+... |
LL | | };
| |_____- `match` arms have incompatible types
@@ -55,8 +53,7 @@ LL | | x
LL | | },
LL | | None => {}
| | ^^ expected `u32`, found `()`
-LL | |
-LL | |
+... |
LL | | };
| |_____- `match` arms have incompatible types
diff --git a/tests/ui/never_type/diverging-place-match.stderr b/tests/ui/never_type/diverging-place-match.stderr
index 74e1bfa0a6b64..14300c4df05e4 100644
--- a/tests/ui/never_type/diverging-place-match.stderr
+++ b/tests/ui/never_type/diverging-place-match.stderr
@@ -5,8 +5,7 @@ LL | / unsafe {
LL | |
LL | | let x: *const ! = 0 as _;
LL | | let _: ! = *x;
-LL | | // Since `*x` "diverges" in HIR, but doesn't count as a read in MIR, this
-LL | | // is unsound since we act as if it diverges but it doesn't.
+... |
LL | | }
| |_____^ expected `!`, found `()`
|
diff --git a/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
index ca7d187ac573b..3c04cf300ad43 100644
--- a/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
@@ -30,10 +30,7 @@ LL | fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) {
| |
| lifetime `'a` defined here
LL | / establish_relationships(&cell_a, &cell_b, |_outlives, x, y| {
-LL | |
-LL | |
-LL | | // Only works if 'x: 'y:
-LL | | demand_y(x, y, x.get())
+... |
LL | | });
| | ^
| | |
diff --git a/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
index d11a64272a9ce..9f5762ccbfa68 100644
--- a/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
+++ b/tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
@@ -30,10 +30,7 @@ LL | fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) {
| |
| lifetime `'a` defined here
LL | / establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| {
-LL | |
-LL | |
-LL | | // Only works if 'x: 'y:
-LL | | demand_y(x, y, x.get())
+... |
LL | | });
| | ^
| | |
diff --git a/tests/ui/nll/snocat-regression.stderr b/tests/ui/nll/snocat-regression.stderr
index 135b69515373b..ae61245290ba2 100644
--- a/tests/ui/nll/snocat-regression.stderr
+++ b/tests/ui/nll/snocat-regression.stderr
@@ -2,10 +2,7 @@ error: `S` does not live long enough
--> $DIR/snocat-regression.rs:7:5
|
LL | / || {
-LL | |
-LL | | //
-LL | | // FIXME(#98437). This regressed at some point and
-LL | | // probably should work.
+... |
LL | | let _x = link;
LL | | };
| |_____^
diff --git a/tests/ui/or-patterns/missing-bindings.stderr b/tests/ui/or-patterns/missing-bindings.stderr
index 677b40a7f0dc1..6288cc589131f 100644
--- a/tests/ui/or-patterns/missing-bindings.stderr
+++ b/tests/ui/or-patterns/missing-bindings.stderr
@@ -219,7 +219,6 @@ LL | | A(
LL | | A(_, a) |
LL | | B(b),
... |
-LL | |
LL | | ) |
| |_____________^ pattern doesn't bind `c`
LL | V3(c),
diff --git a/tests/ui/parser/fn-arg-doc-comment.stderr b/tests/ui/parser/fn-arg-doc-comment.stderr
index c8d7e2efe799d..1891c70890342 100644
--- a/tests/ui/parser/fn-arg-doc-comment.stderr
+++ b/tests/ui/parser/fn-arg-doc-comment.stderr
@@ -30,15 +30,11 @@ note: function defined here
LL | pub fn f(
| ^
LL | / /// Comment
-LL | |
-LL | |
-LL | |
+... |
LL | | id: u8,
| |__________-
LL | / /// Other
-LL | |
-LL | |
-LL | |
+... |
LL | | a: u8,
| |_________-
diff --git a/tests/ui/privacy/effective_visibilities.stderr b/tests/ui/privacy/effective_visibilities.stderr
index 41d63532dea4a..6954279c05a0e 100644
--- a/tests/ui/privacy/effective_visibilities.stderr
+++ b/tests/ui/privacy/effective_visibilities.stderr
@@ -6,7 +6,6 @@ LL | | #![feature(rustc_attrs)]
LL | |
LL | | #[rustc_effective_visibility]
... |
-LL | |
LL | | fn main() {}
| |____________^
diff --git a/tests/ui/privacy/effective_visibilities_invariants.stderr b/tests/ui/privacy/effective_visibilities_invariants.stderr
index 1c19afdcdbafa..64d0402f84e62 100644
--- a/tests/ui/privacy/effective_visibilities_invariants.stderr
+++ b/tests/ui/privacy/effective_visibilities_invariants.stderr
@@ -16,7 +16,6 @@ LL | / #![feature(staged_api)]
LL | |
LL | | pub mod m {}
... |
-LL | |
LL | | fn main() {}
| |____________^
diff --git a/tests/ui/privacy/issue-113860-1.stderr b/tests/ui/privacy/issue-113860-1.stderr
index c05452fb51c79..dad9ebadf0459 100644
--- a/tests/ui/privacy/issue-113860-1.stderr
+++ b/tests/ui/privacy/issue-113860-1.stderr
@@ -14,7 +14,6 @@ LL | |
LL | |
LL | | pub trait Trait {
... |
-LL | |
LL | | fn main() {}
| |____________^
diff --git a/tests/ui/privacy/issue-113860-2.stderr b/tests/ui/privacy/issue-113860-2.stderr
index c53c490ca1ecb..9805c22dbdf58 100644
--- a/tests/ui/privacy/issue-113860-2.stderr
+++ b/tests/ui/privacy/issue-113860-2.stderr
@@ -14,7 +14,6 @@ LL | |
LL | |
LL | | pub trait Trait {
... |
-LL | |
LL | | fn main() {}
| |____________^
diff --git a/tests/ui/privacy/issue-113860.stderr b/tests/ui/privacy/issue-113860.stderr
index d813b740ac5bd..88efcae4a8577 100644
--- a/tests/ui/privacy/issue-113860.stderr
+++ b/tests/ui/privacy/issue-113860.stderr
@@ -14,7 +14,6 @@ LL | |
LL | |
LL | | pub trait Trait {
... |
-LL | |
LL | | fn main() {}
| |____________^
diff --git a/tests/ui/raw-ref-op/never-place-isnt-diverging.stderr b/tests/ui/raw-ref-op/never-place-isnt-diverging.stderr
index af9e788982179..0a8340545eb78 100644
--- a/tests/ui/raw-ref-op/never-place-isnt-diverging.stderr
+++ b/tests/ui/raw-ref-op/never-place-isnt-diverging.stderr
@@ -7,8 +7,7 @@ LL | / unsafe {
LL | |
LL | | let x: *const ! = 0 as _;
LL | | &raw const *x;
-LL | | // Since `*x` is `!`, HIR typeck used to think that it diverges
-LL | | // and allowed the block to coerce to any value, leading to UB.
+... |
LL | | }
| |_____^ expected type parameter `T`, found `()`
|
diff --git a/tests/ui/return/issue-86188-return-not-in-fn-body.stderr b/tests/ui/return/issue-86188-return-not-in-fn-body.stderr
index 4f938670e5e2c..abbcc21141e27 100644
--- a/tests/ui/return/issue-86188-return-not-in-fn-body.stderr
+++ b/tests/ui/return/issue-86188-return-not-in-fn-body.stderr
@@ -15,8 +15,7 @@ LL | / fn bar() {
LL | |
LL | | [(); return];
| | ^^^^^^ the return is part of this body...
-LL | |
-LL | |
+... |
LL | | }
| |_____- ...not the enclosing function body
@@ -27,8 +26,7 @@ LL | / fn foo() {
LL | |
LL | | [(); return];
| | ^^^^^^ the return is part of this body...
-LL | |
-LL | |
+... |
LL | | }
| |_____- ...not the enclosing function body
diff --git a/tests/ui/return/return-match-array-const.stderr b/tests/ui/return/return-match-array-const.stderr
index 85a733adfee69..c2a0ada709898 100644
--- a/tests/ui/return/return-match-array-const.stderr
+++ b/tests/ui/return/return-match-array-const.stderr
@@ -2,13 +2,10 @@ error[E0572]: return statement outside of function body
--> $DIR/return-match-array-const.rs:5:10
|
LL | / fn main() {
-LL | |
-LL | |
-LL | |
+... |
LL | | [(); return match 0 { n => n }];
| | ^^^^^^^^^^^^^^^^^^^^^^^^^ the return is part of this body...
... |
-LL | |
LL | | }
| |_- ...not the enclosing function body
@@ -16,14 +13,10 @@ error[E0572]: return statement outside of function body
--> $DIR/return-match-array-const.rs:9:10
|
LL | / fn main() {
-LL | |
-LL | |
-LL | |
... |
LL | | [(); return match 0 { 0 => 0 }];
| | ^^^^^^^^^^^^^^^^^^^^^^^^^ the return is part of this body...
... |
-LL | |
LL | | }
| |_- ...not the enclosing function body
@@ -31,14 +24,10 @@ error[E0572]: return statement outside of function body
--> $DIR/return-match-array-const.rs:13:10
|
LL | / fn main() {
-LL | |
-LL | |
-LL | |
... |
LL | | [(); return match () { 'a' => 0, _ => 0 }];
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the return is part of this body...
... |
-LL | |
LL | | }
| |_- ...not the enclosing function body
diff --git a/tests/ui/return/tail-expr-as-potential-return.stderr b/tests/ui/return/tail-expr-as-potential-return.stderr
index 635a9e06633ff..756de2b5a1668 100644
--- a/tests/ui/return/tail-expr-as-potential-return.stderr
+++ b/tests/ui/return/tail-expr-as-potential-return.stderr
@@ -4,8 +4,7 @@ error[E0308]: mismatched types
LL | / if x {
LL | | Err(42)
| | ^^^^^^^ expected `()`, found `Result<_, {integer}>`
-LL | |
-LL | |
+... |
LL | | }
| |_____- expected this to be `()`
|
@@ -22,8 +21,7 @@ error[E0308]: mismatched types
LL | / if true {
LL | | 1i32
| | ^^^^ expected `()`, found `i32`
-LL | |
-LL | |
+... |
LL | | }
| |_____- expected this to be `()`
|
@@ -38,8 +36,7 @@ error[E0308]: mismatched types
LL | / if x {
LL | | Err(42)
| | ^^^^^^^ expected `()`, found `Result<_, {integer}>`
-LL | |
-LL | |
+... |
LL | | }
| |_____- expected this to be `()`
|
diff --git a/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2024.stderr b/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2024.stderr
index cceb3bddef439..874b32346af17 100644
--- a/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2024.stderr
+++ b/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2024.stderr
@@ -4,9 +4,7 @@ error: extern blocks must be unsafe
LL | / extern "C" {
LL | |
LL | | safe static TEST1: i32;
-LL | |
-LL | | safe fn test1(i: i32);
-LL | |
+... |
LL | | }
| |_^
diff --git a/tests/ui/specialization/min_specialization/issue-79224.stderr b/tests/ui/specialization/min_specialization/issue-79224.stderr
index 84e526f459785..2b8169af6a2e4 100644
--- a/tests/ui/specialization/min_specialization/issue-79224.stderr
+++ b/tests/ui/specialization/min_specialization/issue-79224.stderr
@@ -39,10 +39,7 @@ error[E0277]: the trait bound `B: Clone` is not satisfied
|
LL | fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
| ______________________________________________________________^
-LL | |
-LL | |
-LL | |
-LL | | write!(f, "foo")
+... |
LL | | }
| |_____^ the trait `Clone` is not implemented for `B`
|
diff --git a/tests/ui/stability-attribute/missing-stability-attr-at-top-level.stderr b/tests/ui/stability-attribute/missing-stability-attr-at-top-level.stderr
index 3af1e82d207a5..fb564932cd50b 100644
--- a/tests/ui/stability-attribute/missing-stability-attr-at-top-level.stderr
+++ b/tests/ui/stability-attribute/missing-stability-attr-at-top-level.stderr
@@ -2,8 +2,7 @@ error: module has missing stability attribute
--> $DIR/missing-stability-attr-at-top-level.rs:1:1
|
LL | / #![feature(staged_api)]
-LL | |
-LL | |
+... |
LL | | fn main() {}
| |____________^
diff --git a/tests/ui/stability-attribute/stability-attribute-trait-impl.stderr b/tests/ui/stability-attribute/stability-attribute-trait-impl.stderr
index 018786dd26dc0..c954282cbc7a2 100644
--- a/tests/ui/stability-attribute/stability-attribute-trait-impl.stderr
+++ b/tests/ui/stability-attribute/stability-attribute-trait-impl.stderr
@@ -23,7 +23,6 @@ LL | |
LL | |
LL | | #[stable(feature = "a", since = "3.3.3")]
... |
-LL | |
LL | | fn main() {}
| |____________^
diff --git a/tests/ui/static/issue-24446.stderr b/tests/ui/static/issue-24446.stderr
index 9c206e5ef3c42..8cb034000beda 100644
--- a/tests/ui/static/issue-24446.stderr
+++ b/tests/ui/static/issue-24446.stderr
@@ -20,10 +20,7 @@ error[E0277]: the size for values of type `(dyn Fn() -> u32 + 'static)` cannot b
|
LL | static foo: dyn Fn() -> u32 = || -> u32 {
| ___________________________________^
-LL | |
-LL | |
-LL | |
-LL | |
+... |
LL | | 0
LL | | };
| |_____^ doesn't have a size known at compile-time
@@ -36,10 +33,7 @@ error[E0308]: mismatched types
|
LL | static foo: dyn Fn() -> u32 = || -> u32 {
| ___________________________________^
-LL | |
-LL | |
-LL | |
-LL | |
+... |
LL | | 0
LL | | };
| |_____^ expected `dyn Fn`, found closure
diff --git a/tests/ui/suggestions/if-then-neeing-semi.stderr b/tests/ui/suggestions/if-then-neeing-semi.stderr
index 6833e0bab2b83..0556d6c50b1ce 100644
--- a/tests/ui/suggestions/if-then-neeing-semi.stderr
+++ b/tests/ui/suggestions/if-then-neeing-semi.stderr
@@ -6,12 +6,10 @@ LL | let _ = if true {
LL | |
LL | | async_dummy();
| | -------------- expected because of this
-LL | |
-LL | | } else {
+... |
LL | | async_dummy()
| | ^^^^^^^^^^^^^ expected `()`, found future
... |
-LL | |
LL | | };
| |_____- `if` and `else` have incompatible types
|
@@ -38,12 +36,10 @@ LL | let _ = if true {
LL | |
LL | | async_dummy();
| | -------------- expected because of this
-LL | |
-LL | | } else {
+... |
LL | | async_dummy2()
| | ^^^^^^^^^^^^^^ expected `()`, found future
... |
-LL | |
LL | | };
| |_____- `if` and `else` have incompatible types
|
@@ -72,12 +68,10 @@ LL | let _ = if true {
LL | |
LL | | async_dummy()
| | ------------- expected because of this
-LL | |
-LL | | } else {
+... |
LL | | async_dummy2()
| | ^^^^^^^^^^^^^^ expected future, found a different future
-LL | |
-LL | |
+... |
LL | | };
| |_____- `if` and `else` have incompatible types
|
@@ -101,8 +95,7 @@ LL | | dummy();
| | | |
| | | help: consider removing this semicolon
| | expected because of this
-LL | |
-LL | | } else {
+... |
LL | | dummy()
| | ^^^^^^^ expected `()`, found `i32`
LL | |
diff --git a/tests/ui/suggestions/match-prev-arm-needing-semi.stderr b/tests/ui/suggestions/match-prev-arm-needing-semi.stderr
index cf3cf45ef402a..f70f6a1e1570b 100644
--- a/tests/ui/suggestions/match-prev-arm-needing-semi.stderr
+++ b/tests/ui/suggestions/match-prev-arm-needing-semi.stderr
@@ -6,12 +6,10 @@ LL | let _ = match true {
LL | | true => {
LL | | async_dummy();
| | -------------- this is found to be of type `()`
-LL | |
-LL | | }
+... |
LL | | false => async_dummy(),
| | ^^^^^^^^^^^^^ expected `()`, found future
... |
-LL | |
LL | | };
| |_____- `match` arms have incompatible types
|
@@ -38,12 +36,10 @@ LL | let _ = match true {
LL | | true => {
LL | | async_dummy();
| | -------------- this is found to be of type `()`
-LL | |
-LL | | }
+... |
LL | | false => async_dummy2(),
| | ^^^^^^^^^^^^^^ expected `()`, found future
... |
-LL | |
LL | | };
| |_____- `match` arms have incompatible types
|
@@ -74,8 +70,7 @@ LL | | true => async_dummy(),
LL | |
LL | | false => async_dummy2(),
| | ^^^^^^^^^^^^^^ expected future, found a different future
-LL | |
-LL | |
+... |
LL | | };
| |_____- `match` arms have incompatible types
|
@@ -98,8 +93,7 @@ LL | | dummy();
| | | |
| | | help: consider removing this semicolon
| | this is found to be of type `()`
-LL | |
-LL | | }
+... |
LL | | false => dummy(),
| | ^^^^^^^ expected `()`, found `i32`
LL | |
diff --git a/tests/ui/suggestions/try-operator-dont-suggest-semicolon.stderr b/tests/ui/suggestions/try-operator-dont-suggest-semicolon.stderr
index 939285498fb69..a275f0c2fa898 100644
--- a/tests/ui/suggestions/try-operator-dont-suggest-semicolon.stderr
+++ b/tests/ui/suggestions/try-operator-dont-suggest-semicolon.stderr
@@ -13,9 +13,7 @@ LL | / if true {
LL | |
LL | | x?
| | ^^ expected `()`, found integer
-LL | |
-LL | |
-LL | |
+... |
LL | | }
| |_____- expected this to be `()`
|
diff --git a/tests/ui/traits/const-traits/ice-120503-async-const-method.stderr b/tests/ui/traits/const-traits/ice-120503-async-const-method.stderr
index 66862d97bf914..e499451d8971b 100644
--- a/tests/ui/traits/const-traits/ice-120503-async-const-method.stderr
+++ b/tests/ui/traits/const-traits/ice-120503-async-const-method.stderr
@@ -26,11 +26,7 @@ LL | async const fn bar(&self) {
| |
| _____`async` because of this
| |
-LL | |
-LL | |
-LL | |
... |
-LL | |
LL | | }
| |_____-
@@ -38,11 +34,7 @@ error[E0407]: method `bar` is not a member of trait `MyTrait`
--> $DIR/ice-120503-async-const-method.rs:6:5
|
LL | / async const fn bar(&self) {
-LL | |
-LL | |
-LL | |
... |
-LL | |
LL | | }
| |_____^ not a member of trait `MyTrait`
diff --git a/tests/ui/transmutability/alignment/align-fail.stderr b/tests/ui/transmutability/alignment/align-fail.stderr
index b9801e511b2ad..7b69820a3c6df 100644
--- a/tests/ui/transmutability/alignment/align-fail.stderr
+++ b/tests/ui/transmutability/alignment/align-fail.stderr
@@ -16,7 +16,6 @@ LL | | Assume {
LL | | alignment: false,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_maybe_transmutable`
help: consider removing the leading `&`-reference
diff --git a/tests/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.stderr b/tests/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.stderr
index c975ff276c8fd..7e5d0a6d41224 100644
--- a/tests/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.stderr
+++ b/tests/ui/transmutability/enums/repr/primitive_reprs_should_have_correct_length.stderr
@@ -16,7 +16,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -38,7 +37,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -60,7 +58,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -82,7 +79,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -104,7 +100,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -126,7 +121,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -148,7 +142,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -170,7 +163,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -192,7 +184,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -214,7 +205,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -236,7 +226,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -258,7 +247,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -280,7 +268,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -302,7 +289,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -324,7 +310,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -346,7 +331,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -368,7 +352,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -390,7 +373,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -412,7 +394,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
@@ -434,7 +415,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_transmutable`
diff --git a/tests/ui/transmutability/references/recursive-wrapper-types-bit-compatible-mut.stderr b/tests/ui/transmutability/references/recursive-wrapper-types-bit-compatible-mut.stderr
index 1698021d5541a..8d3ab4868da26 100644
--- a/tests/ui/transmutability/references/recursive-wrapper-types-bit-compatible-mut.stderr
+++ b/tests/ui/transmutability/references/recursive-wrapper-types-bit-compatible-mut.stderr
@@ -16,7 +16,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: false,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_maybe_transmutable`
diff --git a/tests/ui/transmutability/references/recursive-wrapper-types-bit-incompatible.stderr b/tests/ui/transmutability/references/recursive-wrapper-types-bit-incompatible.stderr
index dbd3e39b36556..8651f40f3fb77 100644
--- a/tests/ui/transmutability/references/recursive-wrapper-types-bit-incompatible.stderr
+++ b/tests/ui/transmutability/references/recursive-wrapper-types-bit-incompatible.stderr
@@ -16,7 +16,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: false,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_maybe_transmutable`
diff --git a/tests/ui/transmutability/references/unit-to-u8.stderr b/tests/ui/transmutability/references/unit-to-u8.stderr
index b5a79b1917fd9..bc9f286e097a9 100644
--- a/tests/ui/transmutability/references/unit-to-u8.stderr
+++ b/tests/ui/transmutability/references/unit-to-u8.stderr
@@ -16,7 +16,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_maybe_transmutable`
diff --git a/tests/ui/transmutability/uninhabited.stderr b/tests/ui/transmutability/uninhabited.stderr
index f112d2fbe44fb..b8b7b67f78160 100644
--- a/tests/ui/transmutability/uninhabited.stderr
+++ b/tests/ui/transmutability/uninhabited.stderr
@@ -40,7 +40,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_maybe_transmutable`
@@ -62,7 +61,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_maybe_transmutable`
@@ -84,7 +82,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_maybe_transmutable`
@@ -106,7 +103,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_maybe_transmutable`
@@ -128,7 +124,6 @@ LL | | Assume {
LL | | alignment: true,
LL | | lifetimes: true,
... |
-LL | | }
LL | | }>
| |__________^ required by this bound in `is_maybe_transmutable`
diff --git a/tests/ui/type-alias-impl-trait/const_generic_type.no_infer.stderr b/tests/ui/type-alias-impl-trait/const_generic_type.no_infer.stderr
index 8888f2d49df1e..c7c93eee63e98 100644
--- a/tests/ui/type-alias-impl-trait/const_generic_type.no_infer.stderr
+++ b/tests/ui/type-alias-impl-trait/const_generic_type.no_infer.stderr
@@ -24,10 +24,7 @@ error: item does not constrain `Bar::{opaque#0}`, but has it in its signature
|
LL | async fn test<const N: crate::Bar>() {
| ______________________________________^
-LL | |
-LL | |
-LL | |
-LL | | #[cfg(infer)]
+... |
LL | | let x: u32 = N;
LL | | }
| |_^
diff --git a/tests/ui/type-alias-impl-trait/hidden_type_mismatch.stderr b/tests/ui/type-alias-impl-trait/hidden_type_mismatch.stderr
index be68bac55756b..8547fd53c18e3 100644
--- a/tests/ui/type-alias-impl-trait/hidden_type_mismatch.stderr
+++ b/tests/ui/type-alias-impl-trait/hidden_type_mismatch.stderr
@@ -31,8 +31,7 @@ note: this definition site has more where clauses than the opaque type
|
LL | / pub fn define_tait() -> Tait
LL | | where
-LL | | // this proves `Bar<()>: Copy`, but `define_tait` is
-LL | | // now uncallable
+... |
LL | | (): Proj<Assoc = i32>,
| |______________________________^
diff --git a/tests/ui/type-alias-impl-trait/hkl_forbidden4.stderr b/tests/ui/type-alias-impl-trait/hkl_forbidden4.stderr
index 08ebc3208d7eb..293c8ea09f176 100644
--- a/tests/ui/type-alias-impl-trait/hkl_forbidden4.stderr
+++ b/tests/ui/type-alias-impl-trait/hkl_forbidden4.stderr
@@ -15,8 +15,7 @@ error: item does not constrain `FutNothing::{opaque#0}`, but has it in its signa
--> $DIR/hkl_forbidden4.rs:22:1
|
LL | / {
-LL | |
-LL | |
+... |
LL | | }
| |_^
|
@@ -55,8 +54,7 @@ LL | type FutNothing<'a> = impl 'a + Future<Output = ()>;
| -- this generic parameter must be used with a generic lifetime parameter
...
LL | / {
-LL | |
-LL | |
+... |
LL | | }
| |_^
diff --git a/tests/ui/typeck/issue-100285.stderr b/tests/ui/typeck/issue-100285.stderr
index 6f86fd18e0f68..388510b7704ad 100644
--- a/tests/ui/typeck/issue-100285.stderr
+++ b/tests/ui/typeck/issue-100285.stderr
@@ -8,7 +8,6 @@ LL | | if n < 0 {
LL | | return i;
LL | | } else if n < 10 {
... |
-LL | |
LL | | }
| |_____^ expected `i32`, found `()`
|
diff --git a/tests/ui/while/while-else-err.stderr b/tests/ui/while/while-else-err.stderr
index b937956108f00..face0c7392541 100644
--- a/tests/ui/while/while-else-err.stderr
+++ b/tests/ui/while/while-else-err.stderr
@@ -6,8 +6,7 @@ LL | while false {
LL |
LL | } else {
| _______^
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|
diff --git a/tests/ui/while/while-else-let-else-err.stderr b/tests/ui/while/while-else-let-else-err.stderr
index 27d68ffdb24ed..4fc99409f7899 100644
--- a/tests/ui/while/while-else-let-else-err.stderr
+++ b/tests/ui/while/while-else-let-else-err.stderr
@@ -6,8 +6,7 @@ LL | let _ = while false {
LL |
LL | } else {
| _______^
-LL | |
-LL | |
+... |
LL | | };
| |_____^
|