diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
index f5e79c04d784f..dbbc4980050de 100644
--- a/compiler/rustc_ast/src/ast.rs
+++ b/compiler/rustc_ast/src/ast.rs
@@ -176,6 +176,8 @@ pub enum GenericArgs {
AngleBracketed(AngleBracketedArgs),
/// The `(A, B)` and `C` in `Foo(A, B) -> C`.
Parenthesized(ParenthesizedArgs),
+ /// `(..)` in return type notation
+ ParenthesizedElided(Span),
}
impl GenericArgs {
@@ -187,6 +189,7 @@ impl GenericArgs {
match self {
AngleBracketed(data) => data.span,
Parenthesized(data) => data.span,
+ ParenthesizedElided(span) => *span,
}
}
}
@@ -2051,7 +2054,7 @@ impl UintTy {
/// * the `A: Bound` in `Trait<A: Bound>`
/// * the `RetTy` in `Trait(ArgTy, ArgTy) -> RetTy`
/// * the `C = { Ct }` in `Trait<C = { Ct }>` (feature `associated_const_equality`)
-/// * the `f(): Bound` in `Trait<f(): Bound>` (feature `return_type_notation`)
+/// * the `f(..): Bound` in `Trait<f(..): Bound>` (feature `return_type_notation`)
#[derive(Clone, Encodable, Decodable, Debug)]
pub struct AssocItemConstraint {
pub id: NodeId,
diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
index 27e781a5a6385..f816375b912d6 100644
--- a/compiler/rustc_ast/src/mut_visit.rs
+++ b/compiler/rustc_ast/src/mut_visit.rs
@@ -582,6 +582,7 @@ fn noop_visit_generic_args<T: MutVisitor>(generic_args: &mut GenericArgs, vis: &
match generic_args {
GenericArgs::AngleBracketed(data) => vis.visit_angle_bracketed_parameter_data(data),
GenericArgs::Parenthesized(data) => vis.visit_parenthesized_parameter_data(data),
+ GenericArgs::ParenthesizedElided(span) => vis.visit_span(span),
}
}
diff --git a/compiler/rustc_ast/src/util/classify.rs b/compiler/rustc_ast/src/util/classify.rs
index 541b95ea97160..1a80a9ccdbf54 100644
--- a/compiler/rustc_ast/src/util/classify.rs
+++ b/compiler/rustc_ast/src/util/classify.rs
@@ -311,6 +311,6 @@ fn path_return_type(path: &ast::Path) -> Option<&ast::Ty> {
ast::FnRetTy::Default(_) => None,
ast::FnRetTy::Ty(ret) => Some(ret),
},
- ast::GenericArgs::AngleBracketed(_) => None,
+ ast::GenericArgs::AngleBracketed(_) | ast::GenericArgs::ParenthesizedElided(_) => None,
}
}
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
index 26cb04d4d47fc..f6929057bed13 100644
--- a/compiler/rustc_ast/src/visit.rs
+++ b/compiler/rustc_ast/src/visit.rs
@@ -609,6 +609,7 @@ where
walk_list!(visitor, visit_ty, inputs);
try_visit!(visitor.visit_fn_ret_ty(output));
}
+ GenericArgs::ParenthesizedElided(_span) => {}
}
V::Result::output()
}
diff --git a/compiler/rustc_ast_lowering/messages.ftl b/compiler/rustc_ast_lowering/messages.ftl
index 58f65f1257fc7..9ed93d481e773 100644
--- a/compiler/rustc_ast_lowering/messages.ftl
+++ b/compiler/rustc_ast_lowering/messages.ftl
@@ -36,10 +36,15 @@ ast_lowering_bad_return_type_notation_inputs =
argument types not allowed with return type notation
.suggestion = remove the input types
+ast_lowering_bad_return_type_notation_needs_dots = return type notation arguments must be elided with `..`
+ .suggestion = add `..`
+
ast_lowering_bad_return_type_notation_output =
return type not allowed with return type notation
.suggestion = remove the return type
+ast_lowering_bad_return_type_notation_position = return type notation not allowed in this position yet
+
ast_lowering_base_expression_double_dot =
base expression required after `..`
.suggestion = add a base expression here
diff --git a/compiler/rustc_ast_lowering/src/errors.rs b/compiler/rustc_ast_lowering/src/errors.rs
index 3d4b6a1f033fb..4c77892a6b753 100644
--- a/compiler/rustc_ast_lowering/src/errors.rs
+++ b/compiler/rustc_ast_lowering/src/errors.rs
@@ -393,6 +393,17 @@ pub enum BadReturnTypeNotation {
#[suggestion(code = "", applicability = "maybe-incorrect")]
span: Span,
},
+ #[diag(ast_lowering_bad_return_type_notation_needs_dots)]
+ NeedsDots {
+ #[primary_span]
+ #[suggestion(code = "(..)", applicability = "maybe-incorrect")]
+ span: Span,
+ },
+ #[diag(ast_lowering_bad_return_type_notation_position)]
+ Position {
+ #[primary_span]
+ span: Span,
+ },
}
#[derive(Diagnostic)]
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
index 8fba46625ab9a..24748d2d00968 100644
--- a/compiler/rustc_ast_lowering/src/lib.rs
+++ b/compiler/rustc_ast_lowering/src/lib.rs
@@ -985,20 +985,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
self.lower_angle_bracketed_parameter_data(data, ParamMode::Explicit, itctx).0
}
GenericArgs::Parenthesized(data) => {
- if data.inputs.is_empty() && matches!(data.output, FnRetTy::Default(..)) {
- let parenthesized = if self.tcx.features().return_type_notation {
- hir::GenericArgsParentheses::ReturnTypeNotation
- } else {
- self.emit_bad_parenthesized_trait_in_assoc_ty(data);
- hir::GenericArgsParentheses::No
- };
- GenericArgsCtor {
- args: Default::default(),
- constraints: &[],
- parenthesized,
- span: data.inputs_span,
- }
- } else if let Some(first_char) = constraint.ident.as_str().chars().next()
+ if let Some(first_char) = constraint.ident.as_str().chars().next()
&& first_char.is_ascii_lowercase()
{
let mut err = if !data.inputs.is_empty() {
@@ -1010,7 +997,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
span: data.inputs_span.shrink_to_hi().to(ty.span),
})
} else {
- unreachable!("inputs are empty and return type is not provided")
+ self.dcx().create_err(errors::BadReturnTypeNotation::NeedsDots {
+ span: data.inputs_span,
+ })
};
if !self.tcx.features().return_type_notation
&& self.tcx.sess.is_nightly_build()
@@ -1040,6 +1029,12 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
.0
}
}
+ GenericArgs::ParenthesizedElided(span) => GenericArgsCtor {
+ args: Default::default(),
+ constraints: &[],
+ parenthesized: hir::GenericArgsParentheses::ReturnTypeNotation,
+ span: *span,
+ },
};
gen_args_ctor.into_generic_args(self)
} else {
diff --git a/compiler/rustc_ast_lowering/src/path.rs b/compiler/rustc_ast_lowering/src/path.rs
index 9a1ca703699a8..6303584bb7846 100644
--- a/compiler/rustc_ast_lowering/src/path.rs
+++ b/compiler/rustc_ast_lowering/src/path.rs
@@ -1,7 +1,8 @@
use crate::ImplTraitPosition;
use super::errors::{
- AsyncBoundNotOnTrait, AsyncBoundOnlyForFnTraits, GenericTypeWithParentheses, UseAngleBrackets,
+ AsyncBoundNotOnTrait, AsyncBoundOnlyForFnTraits, BadReturnTypeNotation,
+ GenericTypeWithParentheses, UseAngleBrackets,
};
use super::ResolverAstLoweringExt;
use super::{GenericArgsCtor, LifetimeRes, ParenthesizedGenericArgs};
@@ -271,6 +272,18 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
)
}
},
+ GenericArgs::ParenthesizedElided(span) => {
+ self.dcx().emit_err(BadReturnTypeNotation::Position { span: *span });
+ (
+ GenericArgsCtor {
+ args: Default::default(),
+ constraints: &[],
+ parenthesized: hir::GenericArgsParentheses::ReturnTypeNotation,
+ span: *span,
+ },
+ false,
+ )
+ }
}
} else {
(
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
index 022f953c6e70f..dd0d904c52cc2 100644
--- a/compiler/rustc_ast_passes/src/ast_validation.rs
+++ b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -1312,6 +1312,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
self.with_impl_trait(None, |this| this.visit_ty(ty));
}
}
+ GenericArgs::ParenthesizedElided(_span) => {}
}
}
@@ -1468,7 +1469,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
span: args.span,
});
}
- None => {}
+ Some(ast::GenericArgs::ParenthesizedElided(_)) | None => {}
}
}
}
@@ -1716,7 +1717,9 @@ fn deny_equality_constraints(
// Add `<Bar = RhsTy>` to `Foo`.
match &mut assoc_path.segments[len].args {
Some(args) => match args.deref_mut() {
- GenericArgs::Parenthesized(_) => continue,
+ GenericArgs::Parenthesized(_) | GenericArgs::ParenthesizedElided(..) => {
+ continue;
+ }
GenericArgs::AngleBracketed(args) => {
args.args.push(arg);
}
diff --git a/compiler/rustc_ast_passes/src/feature_gate.rs b/compiler/rustc_ast_passes/src/feature_gate.rs
index e1c1a027a30a7..9cf3182daea59 100644
--- a/compiler/rustc_ast_passes/src/feature_gate.rs
+++ b/compiler/rustc_ast_passes/src/feature_gate.rs
@@ -1,6 +1,6 @@
use rustc_ast as ast;
use rustc_ast::visit::{self, AssocCtxt, FnCtxt, FnKind, Visitor};
-use rustc_ast::{attr, AssocItemConstraint, AssocItemConstraintKind, NodeId};
+use rustc_ast::{attr, NodeId};
use rustc_ast::{token, PatKind};
use rustc_feature::{AttributeGate, BuiltinAttribute, Features, GateIssue, BUILTIN_ATTRIBUTE_MAP};
use rustc_session::parse::{feature_err, feature_err_issue, feature_warn};
@@ -445,23 +445,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
visit::walk_fn(self, fn_kind)
}
- fn visit_assoc_item_constraint(&mut self, constraint: &'a AssocItemConstraint) {
- if let AssocItemConstraintKind::Bound { .. } = constraint.kind
- && let Some(ast::GenericArgs::Parenthesized(args)) = constraint.gen_args.as_ref()
- && args.inputs.is_empty()
- && let ast::FnRetTy::Default(..) = args.output
- {
- gate!(
- &self,
- return_type_notation,
- constraint.span,
- "return type notation is experimental"
- );
- }
-
- visit::walk_assoc_item_constraint(self, constraint)
- }
-
fn visit_assoc_item(&mut self, i: &'a ast::AssocItem, ctxt: AssocCtxt) {
let is_fn = match &i.kind {
ast::AssocItemKind::Fn(_) => true,
@@ -566,6 +549,7 @@ pub fn check_crate(krate: &ast::Crate, sess: &Session, features: &Features) {
unsafe_extern_blocks,
"`unsafe extern {}` blocks and `safe` keyword are experimental"
);
+ gate_all!(return_type_notation, "return type notation is experimental");
if !visitor.features.never_patterns {
if let Some(spans) = spans.get(&sym::never_patterns) {
@@ -611,10 +595,6 @@ pub fn check_crate(krate: &ast::Crate, sess: &Session, features: &Features) {
gate_all_legacy_dont_use!(box_patterns, "box pattern syntax is experimental");
gate_all_legacy_dont_use!(trait_alias, "trait aliases are experimental");
- // Despite being a new feature, `where T: Trait<Assoc(): Sized>`, which is RTN syntax now,
- // used to be gated under associated_type_bounds, which are right above, so RTN needs to
- // be too.
- gate_all_legacy_dont_use!(return_type_notation, "return type notation is experimental");
gate_all_legacy_dont_use!(decl_macro, "`macro` is experimental");
gate_all_legacy_dont_use!(try_blocks, "`try` blocks are unstable");
gate_all_legacy_dont_use!(auto_traits, "`auto` traits are unstable");
diff --git a/compiler/rustc_ast_pretty/src/pprust/state.rs b/compiler/rustc_ast_pretty/src/pprust/state.rs
index 0225c95dca8e3..0568d368d8c4c 100644
--- a/compiler/rustc_ast_pretty/src/pprust/state.rs
+++ b/compiler/rustc_ast_pretty/src/pprust/state.rs
@@ -1060,6 +1060,11 @@ impl<'a> PrintState<'a> for State<'a> {
self.word(")");
self.print_fn_ret_ty(&data.output);
}
+ ast::GenericArgs::ParenthesizedElided(_) => {
+ self.word("(");
+ self.word("..");
+ self.word(")");
+ }
}
}
}
diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs
index bbe9741bf444e..ad2acb03b3f67 100644
--- a/compiler/rustc_driver_impl/src/lib.rs
+++ b/compiler/rustc_driver_impl/src/lib.rs
@@ -30,7 +30,7 @@ use rustc_errors::{
};
use rustc_feature::find_gated_cfg;
use rustc_interface::util::{self, get_codegen_backend};
-use rustc_interface::{interface, passes, Queries};
+use rustc_interface::{interface, passes, Linker, Queries};
use rustc_lint::unerased_lint_store;
use rustc_metadata::creader::MetadataLoader;
use rustc_metadata::locator;
@@ -41,7 +41,6 @@ use rustc_session::getopts::{self, Matches};
use rustc_session::lint::{Lint, LintId};
use rustc_session::output::collect_crate_types;
use rustc_session::{config, filesearch, EarlyDiagCtxt, Session};
-use rustc_span::def_id::LOCAL_CRATE;
use rustc_span::source_map::FileLoader;
use rustc_span::symbol::sym;
use rustc_span::FileName;
@@ -448,21 +447,9 @@ fn run_compiler(
return early_exit();
}
- let linker = queries.codegen_and_build_linker()?;
-
- // This must run after monomorphization so that all generic types
- // have been instantiated.
- if sess.opts.unstable_opts.print_type_sizes {
- sess.code_stats.print_type_sizes();
- }
-
- if sess.opts.unstable_opts.print_vtable_sizes {
- let crate_name = queries.global_ctxt()?.enter(|tcx| tcx.crate_name(LOCAL_CRATE));
-
- sess.code_stats.print_vtable_sizes(crate_name);
- }
-
- Ok(Some(linker))
+ queries.global_ctxt()?.enter(|tcx| {
+ Ok(Some(Linker::codegen_and_build_linker(tcx, &*compiler.codegen_backend)?))
+ })
})?;
// Linking is done outside the `compiler.enter()` so that the
diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs
index 6cccdec94c0b5..d57fad6ba4c2d 100644
--- a/compiler/rustc_hir/src/hir.rs
+++ b/compiler/rustc_hir/src/hir.rs
@@ -2414,7 +2414,7 @@ pub enum ImplItemKind<'hir> {
/// * the `A: Bound` in `Trait<A: Bound>`
/// * the `RetTy` in `Trait(ArgTy, ArgTy) -> RetTy`
/// * the `C = { Ct }` in `Trait<C = { Ct }>` (feature `associated_const_equality`)
-/// * the `f(): Bound` in `Trait<f(): Bound>` (feature `return_type_notation`)
+/// * the `f(..): Bound` in `Trait<f(..): Bound>` (feature `return_type_notation`)
#[derive(Debug, Clone, Copy, HashStable_Generic)]
pub struct AssocItemConstraint<'hir> {
pub hir_id: HirId,
diff --git a/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
index 4bab25c972754..56dff0808676b 100644
--- a/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
+++ b/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
@@ -951,6 +951,32 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
return err.emit();
}
+ // Special case, we found an extra argument is provided, which is very common in practice.
+ // but there is a obviously better removing suggestion compared to the current one,
+ // try to find the argument with Error type, if we removed it all the types will become good,
+ // then we will replace the current suggestion.
+ if let [Error::Extra(provided_idx)] = &errors[..] {
+ let remove_idx_is_perfect = |idx: usize| -> bool {
+ let removed_arg_tys = provided_arg_tys
+ .iter()
+ .enumerate()
+ .filter_map(|(j, arg)| if idx == j { None } else { Some(arg) })
+ .collect::<IndexVec<ProvidedIdx, _>>();
+ std::iter::zip(formal_and_expected_inputs.iter(), removed_arg_tys.iter()).all(
+ |((expected_ty, _), (provided_ty, _))| {
+ !provided_ty.references_error()
+ && self.can_coerce(*provided_ty, *expected_ty)
+ },
+ )
+ };
+
+ if !remove_idx_is_perfect(provided_idx.as_usize()) {
+ if let Some(i) = (0..provided_args.len()).find(|&i| remove_idx_is_perfect(i)) {
+ errors = vec![Error::Extra(ProvidedIdx::from_usize(i))];
+ }
+ }
+ }
+
let mut err = if formal_and_expected_inputs.len() == provided_args.len() {
struct_span_code_err!(
self.dcx(),
diff --git a/compiler/rustc_interface/src/lib.rs b/compiler/rustc_interface/src/lib.rs
index 38f64ebb04e7b..e37b30749ab30 100644
--- a/compiler/rustc_interface/src/lib.rs
+++ b/compiler/rustc_interface/src/lib.rs
@@ -16,7 +16,7 @@ pub mod util;
pub use callbacks::setup_callbacks;
pub use interface::{run_compiler, Config};
pub use passes::DEFAULT_QUERY_PROVIDERS;
-pub use queries::Queries;
+pub use queries::{Linker, Queries};
#[cfg(test)]
mod tests;
diff --git a/compiler/rustc_interface/src/queries.rs b/compiler/rustc_interface/src/queries.rs
index cfd4304e89303..821e8ee7ba589 100644
--- a/compiler/rustc_interface/src/queries.rs
+++ b/compiler/rustc_interface/src/queries.rs
@@ -65,12 +65,6 @@ impl<'a, 'tcx> QueryResult<'a, &'tcx GlobalCtxt<'tcx>> {
}
}
-impl<T> Default for Query<T> {
- fn default() -> Self {
- Query { result: RefCell::new(None) }
- }
-}
-
pub struct Queries<'tcx> {
compiler: &'tcx Compiler,
gcx_cell: OnceLock<GlobalCtxt<'tcx>>,
@@ -90,8 +84,8 @@ impl<'tcx> Queries<'tcx> {
gcx_cell: OnceLock::new(),
arena: WorkerLocal::new(|_| Arena::default()),
hir_arena: WorkerLocal::new(|_| rustc_hir::Arena::default()),
- parse: Default::default(),
- gcx: Default::default(),
+ parse: Query { result: RefCell::new(None) },
+ gcx: Query { result: RefCell::new(None) },
}
}
@@ -116,23 +110,6 @@ impl<'tcx> Queries<'tcx> {
)
})
}
-
- pub fn codegen_and_build_linker(&'tcx self) -> Result<Linker> {
- self.global_ctxt()?.enter(|tcx| {
- let ongoing_codegen = passes::start_codegen(&*self.compiler.codegen_backend, tcx)?;
-
- Ok(Linker {
- dep_graph: tcx.dep_graph.clone(),
- output_filenames: tcx.output_filenames(()).clone(),
- crate_hash: if tcx.needs_crate_hash() {
- Some(tcx.crate_hash(LOCAL_CRATE))
- } else {
- None
- },
- ongoing_codegen,
- })
- })
- }
}
pub struct Linker {
@@ -144,6 +121,36 @@ pub struct Linker {
}
impl Linker {
+ pub fn codegen_and_build_linker(
+ tcx: TyCtxt<'_>,
+ codegen_backend: &dyn CodegenBackend,
+ ) -> Result<Linker> {
+ let ongoing_codegen = passes::start_codegen(codegen_backend, tcx)?;
+
+ // This must run after monomorphization so that all generic types
+ // have been instantiated.
+ if tcx.sess.opts.unstable_opts.print_type_sizes {
+ tcx.sess.code_stats.print_type_sizes();
+ }
+
+ if tcx.sess.opts.unstable_opts.print_vtable_sizes {
+ let crate_name = tcx.crate_name(LOCAL_CRATE);
+
+ tcx.sess.code_stats.print_vtable_sizes(crate_name);
+ }
+
+ Ok(Linker {
+ dep_graph: tcx.dep_graph.clone(),
+ output_filenames: tcx.output_filenames(()).clone(),
+ crate_hash: if tcx.needs_crate_hash() {
+ Some(tcx.crate_hash(LOCAL_CRATE))
+ } else {
+ None
+ },
+ ongoing_codegen,
+ })
+ }
+
pub fn link(self, sess: &Session, codegen_backend: &dyn CodegenBackend) -> Result<()> {
let (codegen_results, work_products) =
codegen_backend.join_codegen(self.ongoing_codegen, sess, &self.output_filenames);
@@ -197,7 +204,7 @@ impl Compiler {
F: for<'tcx> FnOnce(&'tcx Queries<'tcx>) -> T,
{
// Must declare `_timer` first so that it is dropped after `queries`.
- let mut _timer = None;
+ let _timer;
let queries = Queries::new(self);
let ret = f(&queries);
@@ -220,7 +227,7 @@ impl Compiler {
// The timer's lifetime spans the dropping of `queries`, which contains
// the global context.
- _timer = Some(self.sess.timer("free_global_ctxt"));
+ _timer = self.sess.timer("free_global_ctxt");
if let Err((path, error)) = queries.finish() {
self.sess.dcx().emit_fatal(errors::FailedWritingFile { path: &path, error });
}
diff --git a/compiler/rustc_middle/src/ty/sty.rs b/compiler/rustc_middle/src/ty/sty.rs
index ff40a726fbc38..52690ae678d6c 100644
--- a/compiler/rustc_middle/src/ty/sty.rs
+++ b/compiler/rustc_middle/src/ty/sty.rs
@@ -68,6 +68,10 @@ impl<'tcx> ty::CoroutineArgs<TyCtxt<'tcx>> {
const RETURNED: usize = 1;
/// Coroutine has been poisoned.
const POISONED: usize = 2;
+ /// Number of variants to reserve in coroutine state. Corresponds to
+ /// `UNRESUMED` (beginning of a coroutine) and `RETURNED`/`POISONED`
+ /// (end of a coroutine) states.
+ const RESERVED_VARIANTS: usize = 3;
const UNRESUMED_NAME: &'static str = "Unresumed";
const RETURNED_NAME: &'static str = "Returned";
@@ -116,7 +120,7 @@ impl<'tcx> ty::CoroutineArgs<TyCtxt<'tcx>> {
Self::UNRESUMED => Cow::from(Self::UNRESUMED_NAME),
Self::RETURNED => Cow::from(Self::RETURNED_NAME),
Self::POISONED => Cow::from(Self::POISONED_NAME),
- _ => Cow::from(format!("Suspend{}", v.as_usize() - 3)),
+ _ => Cow::from(format!("Suspend{}", v.as_usize() - Self::RESERVED_VARIANTS)),
}
}
diff --git a/compiler/rustc_mir_transform/src/coroutine.rs b/compiler/rustc_mir_transform/src/coroutine.rs
index 05674792426f1..4c00038365b73 100644
--- a/compiler/rustc_mir_transform/src/coroutine.rs
+++ b/compiler/rustc_mir_transform/src/coroutine.rs
@@ -208,11 +208,8 @@ const UNRESUMED: usize = CoroutineArgs::UNRESUMED;
const RETURNED: usize = CoroutineArgs::RETURNED;
/// Coroutine has panicked and is poisoned.
const POISONED: usize = CoroutineArgs::POISONED;
-
-/// Number of variants to reserve in coroutine state. Corresponds to
-/// `UNRESUMED` (beginning of a coroutine) and `RETURNED`/`POISONED`
-/// (end of a coroutine) states.
-const RESERVED_VARIANTS: usize = 3;
+/// Number of reserved variants of coroutine state.
+const RESERVED_VARIANTS: usize = CoroutineArgs::RESERVED_VARIANTS;
/// A `yield` point in the coroutine.
struct SuspensionPoint<'tcx> {
diff --git a/compiler/rustc_parse/messages.ftl b/compiler/rustc_parse/messages.ftl
index f08efe60d96b8..e4c75ac11454a 100644
--- a/compiler/rustc_parse/messages.ftl
+++ b/compiler/rustc_parse/messages.ftl
@@ -45,10 +45,6 @@ parse_bad_assoc_type_bounds = bounds on associated types do not belong here
parse_bad_item_kind = {$descr} is not supported in {$ctx}
.help = consider moving the {$descr} out to a nearby module scope
-parse_bad_return_type_notation_dotdot =
- return type notation uses `()` instead of `(..)` for elided arguments
- .suggestion = remove the `..`
-
parse_bad_return_type_notation_output =
return type not allowed with return type notation
.suggestion = remove the return type
diff --git a/compiler/rustc_parse/src/errors.rs b/compiler/rustc_parse/src/errors.rs
index 8d49887f16441..6894f470d88fd 100644
--- a/compiler/rustc_parse/src/errors.rs
+++ b/compiler/rustc_parse/src/errors.rs
@@ -2567,14 +2567,6 @@ pub(crate) struct BadReturnTypeNotationOutput {
pub span: Span,
}
-#[derive(Diagnostic)]
-#[diag(parse_bad_return_type_notation_dotdot)]
-pub(crate) struct BadReturnTypeNotationDotDot {
- #[primary_span]
- #[suggestion(code = "", applicability = "maybe-incorrect")]
- pub span: Span,
-}
-
#[derive(Diagnostic)]
#[diag(parse_bad_assoc_type_bounds)]
pub(crate) struct BadAssocTypeBounds {
diff --git a/compiler/rustc_parse/src/parser/path.rs b/compiler/rustc_parse/src/parser/path.rs
index da8d1194325b4..03c647dd5278e 100644
--- a/compiler/rustc_parse/src/parser/path.rs
+++ b/compiler/rustc_parse/src/parser/path.rs
@@ -353,18 +353,17 @@ impl<'a> Parser<'a> {
})?;
let span = lo.to(self.prev_token.span);
AngleBracketedArgs { args, span }.into()
- } else if self.may_recover()
- && self.token.kind == token::OpenDelim(Delimiter::Parenthesis)
+ } else if self.token.kind == token::OpenDelim(Delimiter::Parenthesis)
// FIXME(return_type_notation): Could also recover `...` here.
&& self.look_ahead(1, |tok| tok.kind == token::DotDot)
{
- self.bump();
- self.dcx()
- .emit_err(errors::BadReturnTypeNotationDotDot { span: self.token.span });
- self.bump();
+ self.bump(); // (
+ self.bump(); // ..
self.expect(&token::CloseDelim(Delimiter::Parenthesis))?;
let span = lo.to(self.prev_token.span);
+ self.psess.gated_spans.gate(sym::return_type_notation, span);
+
if self.eat_noexpect(&token::RArrow) {
let lo = self.prev_token.span;
let ty = self.parse_ty()?;
@@ -372,13 +371,7 @@ impl<'a> Parser<'a> {
.emit_err(errors::BadReturnTypeNotationOutput { span: lo.to(ty.span) });
}
- ParenthesizedArgs {
- span,
- inputs: ThinVec::new(),
- inputs_span: span,
- output: ast::FnRetTy::Default(self.prev_token.span.shrink_to_hi()),
- }
- .into()
+ P(ast::GenericArgs::ParenthesizedElided(span))
} else {
// `(T, U) -> R`
@@ -733,14 +726,6 @@ impl<'a> Parser<'a> {
let span = lo.to(self.prev_token.span);
- if let AssocItemConstraintKind::Bound { .. } = kind
- && let Some(ast::GenericArgs::Parenthesized(args)) = &gen_args
- && args.inputs.is_empty()
- && let ast::FnRetTy::Default(..) = args.output
- {
- self.psess.gated_spans.gate(sym::return_type_notation, span);
- }
-
let constraint =
AssocItemConstraint { id: ast::DUMMY_NODE_ID, ident, gen_args, kind, span };
Ok(Some(AngleBracketedArg::Constraint(constraint)))
diff --git a/compiler/rustc_passes/src/hir_stats.rs b/compiler/rustc_passes/src/hir_stats.rs
index 0ba61f8e8b40f..0720efebf9721 100644
--- a/compiler/rustc_passes/src/hir_stats.rs
+++ b/compiler/rustc_passes/src/hir_stats.rs
@@ -695,7 +695,7 @@ impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {
fn visit_generic_args(&mut self, g: &'v ast::GenericArgs) {
record_variants!(
(self, g, g, Id::None, ast, GenericArgs, GenericArgs),
- [AngleBracketed, Parenthesized]
+ [AngleBracketed, Parenthesized, ParenthesizedElided]
);
ast_visit::walk_generic_args(self, g)
}
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs
index 66a1c05289b7d..ad4e222f4deda 100644
--- a/compiler/rustc_resolve/src/late.rs
+++ b/compiler/rustc_resolve/src/late.rs
@@ -1221,6 +1221,7 @@ impl<'a: 'ast, 'ast, 'tcx> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast,
}
}
}
+ GenericArgs::ParenthesizedElided(_) => {}
}
}
}
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs
index 94cdce1025fe5..38963ef4ef092 100644
--- a/compiler/rustc_resolve/src/lib.rs
+++ b/compiler/rustc_resolve/src/lib.rs
@@ -350,6 +350,7 @@ impl<'a> From<&'a ast::PathSegment> for Segment {
(args.span, found_lifetimes)
}
GenericArgs::Parenthesized(args) => (args.span, true),
+ GenericArgs::ParenthesizedElided(span) => (*span, true),
}
} else {
(DUMMY_SP, false)
diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
index 9050a1c12078b..3b1a8830e1cdc 100644
--- a/src/librustdoc/clean/types.rs
+++ b/src/librustdoc/clean/types.rs
@@ -2557,7 +2557,7 @@ pub(crate) struct ProcMacro {
/// * the `A: Bound` in `Trait<A: Bound>`
/// * the `RetTy` in `Trait(ArgTy, ArgTy) -> RetTy`
/// * the `C = { Ct }` in `Trait<C = { Ct }>` (feature `associated_const_equality`)
-/// * the `f(): Bound` in `Trait<f(): Bound>` (feature `return_type_notation`)
+/// * the `f(..): Bound` in `Trait<f(..): Bound>` (feature `return_type_notation`)
#[derive(Clone, PartialEq, Eq, Debug, Hash)]
pub(crate) struct AssocItemConstraint {
pub(crate) assoc: PathSegment,
diff --git a/src/llvm-project b/src/llvm-project
index 5a5152f653959..e6a6470d1eb4c 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit 5a5152f653959d14d68613a3a8a033fb65eec021
+Subproject commit e6a6470d1eb4c88fee4b1ea98cd8e0ac4a181c16
diff --git a/src/tools/rustfmt/src/types.rs b/src/tools/rustfmt/src/types.rs
index c0bf9482b1143..c826547e9d001 100644
--- a/src/tools/rustfmt/src/types.rs
+++ b/src/tools/rustfmt/src/types.rs
@@ -484,21 +484,25 @@ fn rewrite_generic_args(
span: Span,
) -> Option<String> {
match gen_args {
- ast::GenericArgs::AngleBracketed(ref data) if !data.args.is_empty() => {
- let args = data
- .args
- .iter()
- .map(|x| match x {
- ast::AngleBracketedArg::Arg(generic_arg) => {
- SegmentParam::from_generic_arg(generic_arg)
- }
- ast::AngleBracketedArg::Constraint(constraint) => {
- SegmentParam::Binding(constraint)
- }
- })
- .collect::<Vec<_>>();
+ ast::GenericArgs::AngleBracketed(ref data) => {
+ if data.args.is_empty() {
+ Some("".to_owned())
+ } else {
+ let args = data
+ .args
+ .iter()
+ .map(|x| match x {
+ ast::AngleBracketedArg::Arg(generic_arg) => {
+ SegmentParam::from_generic_arg(generic_arg)
+ }
+ ast::AngleBracketedArg::Constraint(constraint) => {
+ SegmentParam::Binding(constraint)
+ }
+ })
+ .collect::<Vec<_>>();
- overflow::rewrite_with_angle_brackets(context, "", args.iter(), shape, span)
+ overflow::rewrite_with_angle_brackets(context, "", args.iter(), shape, span)
+ }
}
ast::GenericArgs::Parenthesized(ref data) => format_function_type(
data.inputs.iter().map(|x| &**x),
@@ -508,7 +512,7 @@ fn rewrite_generic_args(
context,
shape,
),
- _ => Some("".to_owned()),
+ ast::GenericArgs::ParenthesizedElided(..) => Some("(..)".to_owned()),
}
}
diff --git a/src/tools/rustfmt/tests/target/return-type-notation.rs b/src/tools/rustfmt/tests/target/return-type-notation.rs
new file mode 100644
index 0000000000000..0f26e7e272b8b
--- /dev/null
+++ b/src/tools/rustfmt/tests/target/return-type-notation.rs
@@ -0,0 +1,10 @@
+fn rtn()
+where
+ T: Trait<method(..): Send + 'static>,
+ T::method(..): Send + 'static,
+{
+}
+
+fn test() {
+ let x: T::method(..);
+}
diff --git a/tests/crashes/125249.rs b/tests/crashes/125249.rs
index 18196d7b34fe8..1cf6338a0d622 100644
--- a/tests/crashes/125249.rs
+++ b/tests/crashes/125249.rs
@@ -2,7 +2,7 @@
#![feature(return_position_impl_trait_in_trait, return_type_notation)]
trait IntFactory {
- fn stream(&self) -> impl IntFactory<stream(): IntFactory<stream(): Send> + Send>;
+ fn stream(&self) -> impl IntFactory<stream(..): IntFactory<stream(..): Send> + Send>;
}
pub fn main() {}
diff --git a/tests/run-make/inaccessible-temp-dir/rmake.rs b/tests/run-make/inaccessible-temp-dir/rmake.rs
index b98e151e90696..62b8479c32881 100644
--- a/tests/run-make/inaccessible-temp-dir/rmake.rs
+++ b/tests/run-make/inaccessible-temp-dir/rmake.rs
@@ -14,7 +14,7 @@
// See https://github.com/rust-lang/rust/issues/66530
//@ ignore-riscv64
-// FIXME: The riscv build container runs as root, and can always write
+// FIXME: The riscv64gc-gnu build container runs as root, and can always write
// into `inaccessible/tmp`. Ideally, the riscv64-gnu docker container
// would use a non-root user, but this leads to issues with
// `mkfs.ext4 -d`, as well as mounting a loop device for the rootfs.
diff --git a/tests/run-make/rustdoc-io-error/rmake.rs b/tests/run-make/rustdoc-io-error/rmake.rs
index d60e4438e6f27..69afea401622d 100644
--- a/tests/run-make/rustdoc-io-error/rmake.rs
+++ b/tests/run-make/rustdoc-io-error/rmake.rs
@@ -6,8 +6,13 @@
// permissions so that it is not writable. We have to take special care to set
// the permissions back to normal so that it's able to be deleted later.
+//@ ignore-riscv64
+//@ ignore-arm
+// FIXME: The riscv64gc-gnu and armhf-gnu build containers run as root,
+// and can always write into `inaccessible/tmp`. Ideally, these docker
+// containers would use a non-root user, but this leads to issues with
+// `mkfs.ext4 -d`, as well as mounting a loop device for the rootfs.
//@ ignore-windows - the `set_readonly` functions doesn't work on folders.
-//@ ignore-arm - weird file perms on armhf-gnu
use run_make_support::{path, rustdoc};
use std::fs;
diff --git a/tests/ui-fulldeps/run-compiler-twice.rs b/tests/ui-fulldeps/run-compiler-twice.rs
index 02748626723d9..720fc42cc5700 100644
--- a/tests/ui-fulldeps/run-compiler-twice.rs
+++ b/tests/ui-fulldeps/run-compiler-twice.rs
@@ -17,6 +17,7 @@ extern crate rustc_span;
use std::path::{Path, PathBuf};
+use rustc_interface::Linker;
use rustc_interface::interface;
use rustc_session::config::{Input, Options, OutFileName, OutputType, OutputTypes};
use rustc_span::FileName;
@@ -78,8 +79,10 @@ fn compile(code: String, output: PathBuf, sysroot: PathBuf, linker: Option<&Path
interface::run_compiler(config, |compiler| {
let linker = compiler.enter(|queries| {
- queries.global_ctxt()?.enter(|tcx| tcx.analysis(()))?;
- queries.codegen_and_build_linker()
+ queries.global_ctxt()?.enter(|tcx| {
+ tcx.analysis(())?;
+ Linker::codegen_and_build_linker(tcx, &*compiler.codegen_backend)
+ })
});
linker.unwrap().link(&compiler.sess, &*compiler.codegen_backend).unwrap();
});
diff --git a/tests/ui/argument-suggestions/suggest-better-removing-issue-126246.rs b/tests/ui/argument-suggestions/suggest-better-removing-issue-126246.rs
new file mode 100644
index 0000000000000..fa1802283c39c
--- /dev/null
+++ b/tests/ui/argument-suggestions/suggest-better-removing-issue-126246.rs
@@ -0,0 +1,21 @@
+fn add_one(x: i32) -> i32 {
+ x + 1
+}
+
+fn add_two(x: i32, y: i32) -> i32 {
+ x + y
+}
+
+fn main() {
+ add_one(2, 2); //~ ERROR this function takes 1 argument but 2 arguments were supplied
+ add_one(no_such_local, 10); //~ ERROR cannot find value `no_such_local` in this scope
+ //~| ERROR this function takes 1 argument but 2 arguments were supplied
+ add_one(10, no_such_local); //~ ERROR cannot find value `no_such_local` in this scope
+ //~| ERROR this function takes 1 argument but 2 arguments were supplied
+ add_two(10, no_such_local, 10); //~ ERROR cannot find value `no_such_local` in this scope
+ //~| ERROR this function takes 2 arguments but 3 arguments were supplied
+ add_two(no_such_local, 10, 10); //~ ERROR cannot find value `no_such_local` in this scope
+ //~| ERROR this function takes 2 arguments but 3 arguments were supplied
+ add_two(10, 10, no_such_local); //~ ERROR cannot find value `no_such_local` in this scope
+ //~| ERROR this function takes 2 arguments but 3 arguments were supplied
+}
diff --git a/tests/ui/argument-suggestions/suggest-better-removing-issue-126246.stderr b/tests/ui/argument-suggestions/suggest-better-removing-issue-126246.stderr
new file mode 100644
index 0000000000000..7c4daa3ffe95b
--- /dev/null
+++ b/tests/ui/argument-suggestions/suggest-better-removing-issue-126246.stderr
@@ -0,0 +1,124 @@
+error[E0425]: cannot find value `no_such_local` in this scope
+ --> $DIR/suggest-better-removing-issue-126246.rs:11:13
+ |
+LL | add_one(no_such_local, 10);
+ | ^^^^^^^^^^^^^ not found in this scope
+
+error[E0425]: cannot find value `no_such_local` in this scope
+ --> $DIR/suggest-better-removing-issue-126246.rs:13:17
+ |
+LL | add_one(10, no_such_local);
+ | ^^^^^^^^^^^^^ not found in this scope
+
+error[E0425]: cannot find value `no_such_local` in this scope
+ --> $DIR/suggest-better-removing-issue-126246.rs:15:17
+ |
+LL | add_two(10, no_such_local, 10);
+ | ^^^^^^^^^^^^^ not found in this scope
+
+error[E0425]: cannot find value `no_such_local` in this scope
+ --> $DIR/suggest-better-removing-issue-126246.rs:17:13
+ |
+LL | add_two(no_such_local, 10, 10);
+ | ^^^^^^^^^^^^^ not found in this scope
+
+error[E0425]: cannot find value `no_such_local` in this scope
+ --> $DIR/suggest-better-removing-issue-126246.rs:19:21
+ |
+LL | add_two(10, 10, no_such_local);
+ | ^^^^^^^^^^^^^ not found in this scope
+
+error[E0061]: this function takes 1 argument but 2 arguments were supplied
+ --> $DIR/suggest-better-removing-issue-126246.rs:10:5
+ |
+LL | add_one(2, 2);
+ | ^^^^^^^ ---
+ | | |
+ | | unexpected argument of type `{integer}`
+ | help: remove the extra argument
+ |
+note: function defined here
+ --> $DIR/suggest-better-removing-issue-126246.rs:1:4
+ |
+LL | fn add_one(x: i32) -> i32 {
+ | ^^^^^^^ ------
+
+error[E0061]: this function takes 1 argument but 2 arguments were supplied
+ --> $DIR/suggest-better-removing-issue-126246.rs:11:5
+ |
+LL | add_one(no_such_local, 10);
+ | ^^^^^^^ ---------------
+ | |
+ | unexpected argument
+ | help: remove the extra argument
+ |
+note: function defined here
+ --> $DIR/suggest-better-removing-issue-126246.rs:1:4
+ |
+LL | fn add_one(x: i32) -> i32 {
+ | ^^^^^^^ ------
+
+error[E0061]: this function takes 1 argument but 2 arguments were supplied
+ --> $DIR/suggest-better-removing-issue-126246.rs:13:5
+ |
+LL | add_one(10, no_such_local);
+ | ^^^^^^^ ---------------
+ | | |
+ | | unexpected argument
+ | help: remove the extra argument
+ |
+note: function defined here
+ --> $DIR/suggest-better-removing-issue-126246.rs:1:4
+ |
+LL | fn add_one(x: i32) -> i32 {
+ | ^^^^^^^ ------
+
+error[E0061]: this function takes 2 arguments but 3 arguments were supplied
+ --> $DIR/suggest-better-removing-issue-126246.rs:15:5
+ |
+LL | add_two(10, no_such_local, 10);
+ | ^^^^^^^ ---------------
+ | | |
+ | | unexpected argument
+ | help: remove the extra argument
+ |
+note: function defined here
+ --> $DIR/suggest-better-removing-issue-126246.rs:5:4
+ |
+LL | fn add_two(x: i32, y: i32) -> i32 {
+ | ^^^^^^^ ------ ------
+
+error[E0061]: this function takes 2 arguments but 3 arguments were supplied
+ --> $DIR/suggest-better-removing-issue-126246.rs:17:5
+ |
+LL | add_two(no_such_local, 10, 10);
+ | ^^^^^^^ ---------------
+ | |
+ | unexpected argument
+ | help: remove the extra argument
+ |
+note: function defined here
+ --> $DIR/suggest-better-removing-issue-126246.rs:5:4
+ |
+LL | fn add_two(x: i32, y: i32) -> i32 {
+ | ^^^^^^^ ------ ------
+
+error[E0061]: this function takes 2 arguments but 3 arguments were supplied
+ --> $DIR/suggest-better-removing-issue-126246.rs:19:5
+ |
+LL | add_two(10, 10, no_such_local);
+ | ^^^^^^^ ---------------
+ | | |
+ | | unexpected argument
+ | help: remove the extra argument
+ |
+note: function defined here
+ --> $DIR/suggest-better-removing-issue-126246.rs:5:4
+ |
+LL | fn add_two(x: i32, y: i32) -> i32 {
+ | ^^^^^^^ ------ ------
+
+error: aborting due to 11 previous errors
+
+Some errors have detailed explanations: E0061, E0425.
+For more information about an error, try `rustc --explain E0061`.
diff --git a/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.rs b/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.rs
index c23eff79ce2e5..a8c8a85c5aa68 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.rs
+++ b/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.rs
@@ -13,7 +13,7 @@ fn foo<T: Trait<method(i32): Send>>() {}
fn bar<T: Trait<method() -> (): Send>>() {}
//~^ ERROR return type not allowed with return type notation
-fn baz<T: Trait<method(..): Send>>() {}
-//~^ ERROR return type notation uses `()` instead of `(..)` for elided arguments
+fn baz<T: Trait<method(): Send>>() {}
+//~^ ERROR return type notation arguments must be elided with `..`
fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.stderr b/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.stderr
index d95249efe4049..7e1695984f1c3 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.stderr
+++ b/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.stderr
@@ -1,9 +1,3 @@
-error: return type notation uses `()` instead of `(..)` for elided arguments
- --> $DIR/bad-inputs-and-output.rs:16:24
- |
-LL | fn baz<T: Trait<method(..): Send>>() {}
- | ^^ help: remove the `..`
-
warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/bad-inputs-and-output.rs:3:12
|
@@ -25,5 +19,11 @@ error: return type not allowed with return type notation
LL | fn bar<T: Trait<method() -> (): Send>>() {}
| ^^^^^^ help: remove the return type
+error: return type notation arguments must be elided with `..`
+ --> $DIR/bad-inputs-and-output.rs:16:23
+ |
+LL | fn baz<T: Trait<method(): Send>>() {}
+ | ^^ help: add `..`: `(..)`
+
error: aborting due to 3 previous errors; 1 warning emitted
diff --git a/tests/ui/associated-type-bounds/return-type-notation/bare-path.rs b/tests/ui/associated-type-bounds/return-type-notation/bare-path.rs
new file mode 100644
index 0000000000000..f507d82afec2f
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/bare-path.rs
@@ -0,0 +1,26 @@
+#![feature(return_type_notation)]
+//~^ WARN the feature `return_type_notation` is incomplete
+
+trait Tr {
+ const CONST: usize;
+
+ fn method() -> impl Sized;
+}
+
+fn foo<T: Tr>()
+where
+ T::method(..): Send,
+ //~^ ERROR return type notation not allowed in this position yet
+ //~| ERROR expected type, found function
+ <T as Tr>::method(..): Send,
+ //~^ ERROR return type notation not allowed in this position yet
+ //~| ERROR expected associated type, found associated function `Tr::method`
+{
+ let _ = T::CONST::(..);
+ //~^ ERROR return type notation not allowed in this position yet
+ let _: T::method(..);
+ //~^ ERROR return type notation not allowed in this position yet
+ //~| ERROR expected type, found function
+}
+
+fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/bare-path.stderr b/tests/ui/associated-type-bounds/return-type-notation/bare-path.stderr
new file mode 100644
index 0000000000000..cb45de59c7e23
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/bare-path.stderr
@@ -0,0 +1,66 @@
+error[E0575]: expected associated type, found associated function `Tr::method`
+ --> $DIR/bare-path.rs:15:5
+ |
+LL | <T as Tr>::method(..): Send,
+ | ^^^^^^^^^^^^^^^^^^^^^ not a associated type
+
+warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
+ --> $DIR/bare-path.rs:1:12
+ |
+LL | #![feature(return_type_notation)]
+ | ^^^^^^^^^^^^^^^^^^^^
+ |
+ = note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
+ = note: `#[warn(incomplete_features)]` on by default
+
+error: return type notation not allowed in this position yet
+ --> $DIR/bare-path.rs:19:23
+ |
+LL | let _ = T::CONST::(..);
+ | ^^^^
+
+error: return type notation not allowed in this position yet
+ --> $DIR/bare-path.rs:21:21
+ |
+LL | let _: T::method(..);
+ | ^^^^
+
+error: return type notation not allowed in this position yet
+ --> $DIR/bare-path.rs:12:14
+ |
+LL | T::method(..): Send,
+ | ^^^^
+
+error: return type notation not allowed in this position yet
+ --> $DIR/bare-path.rs:15:22
+ |
+LL | <T as Tr>::method(..): Send,
+ | ^^^^
+
+error: expected type, found function
+ --> $DIR/bare-path.rs:12:8
+ |
+LL | T::method(..): Send,
+ | ^^^^^^ unexpected function
+ |
+note: the associated function is defined here
+ --> $DIR/bare-path.rs:7:5
+ |
+LL | fn method() -> impl Sized;
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: expected type, found function
+ --> $DIR/bare-path.rs:21:15
+ |
+LL | let _: T::method(..);
+ | ^^^^^^ unexpected function
+ |
+note: the associated function is defined here
+ --> $DIR/bare-path.rs:7:5
+ |
+LL | fn method() -> impl Sized;
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 7 previous errors; 1 warning emitted
+
+For more information about this error, try `rustc --explain E0575`.
diff --git a/tests/ui/associated-type-bounds/return-type-notation/basic.rs b/tests/ui/associated-type-bounds/return-type-notation/basic.rs
index 9755fd01c9764..be489a19a7ad2 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/basic.rs
+++ b/tests/ui/associated-type-bounds/return-type-notation/basic.rs
@@ -17,7 +17,7 @@ async fn foo<T: Foo>() -> Result<(), ()> {
fn is_send(_: impl Send) {}
fn test<
- #[cfg(with)] T: Foo<method(): Send>,
+ #[cfg(with)] T: Foo<method(..): Send>,
#[cfg(without)] T: Foo,
>() {
is_send(foo::<T>());
diff --git a/tests/ui/associated-type-bounds/return-type-notation/equality.rs b/tests/ui/associated-type-bounds/return-type-notation/equality.rs
index ae38dce1818c9..95c16fa1e3f84 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/equality.rs
+++ b/tests/ui/associated-type-bounds/return-type-notation/equality.rs
@@ -9,7 +9,7 @@ trait Trait {
async fn method() {}
}
-fn test<T: Trait<method() = Box<dyn Future<Output = ()>>>>() {}
+fn test<T: Trait<method(..) = Box<dyn Future<Output = ()>>>>() {}
//~^ ERROR return type notation is not allowed to use type equality
fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/equality.stderr b/tests/ui/associated-type-bounds/return-type-notation/equality.stderr
index d432e95773541..d76b1bd1c0510 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/equality.stderr
+++ b/tests/ui/associated-type-bounds/return-type-notation/equality.stderr
@@ -10,8 +10,8 @@ LL | #![feature(return_type_notation)]
error: return type notation is not allowed to use type equality
--> $DIR/equality.rs:12:18
|
-LL | fn test<T: Trait<method() = Box<dyn Future<Output = ()>>>>() {}
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | fn test<T: Trait<method(..) = Box<dyn Future<Output = ()>>>>() {}
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 1 previous error; 1 warning emitted
diff --git a/tests/ui/associated-type-bounds/return-type-notation/issue-120208-higher-ranked-const.rs b/tests/ui/associated-type-bounds/return-type-notation/issue-120208-higher-ranked-const.rs
index 11728b879900e..4d026b7d1d859 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/issue-120208-higher-ranked-const.rs
+++ b/tests/ui/associated-type-bounds/return-type-notation/issue-120208-higher-ranked-const.rs
@@ -9,7 +9,7 @@ trait HealthCheck {
async fn do_health_check_par<HC>(hc: HC)
where
- HC: HealthCheck<check(): Send> + Send + 'static,
+ HC: HealthCheck<check(..): Send> + Send + 'static,
//~^ ERROR return type notation is not allowed for functions that have const parameters
{
}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/issue-120208-higher-ranked-const.stderr b/tests/ui/associated-type-bounds/return-type-notation/issue-120208-higher-ranked-const.stderr
index 8a3f037d00321..12f32a75eda32 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/issue-120208-higher-ranked-const.stderr
+++ b/tests/ui/associated-type-bounds/return-type-notation/issue-120208-higher-ranked-const.stderr
@@ -13,8 +13,8 @@ error: return type notation is not allowed for functions that have const paramet
LL | async fn check<const N: usize>() -> bool;
| -------------- const parameter declared here
...
-LL | HC: HealthCheck<check(): Send> + Send + 'static,
- | ^^^^^^^^^^^^^
+LL | HC: HealthCheck<check(..): Send> + Send + 'static,
+ | ^^^^^^^^^^^^^^^
error: aborting due to 1 previous error; 1 warning emitted
diff --git a/tests/ui/associated-type-bounds/return-type-notation/missing.rs b/tests/ui/associated-type-bounds/return-type-notation/missing.rs
index 9a8b77d00b714..3a04a56339ba5 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/missing.rs
+++ b/tests/ui/associated-type-bounds/return-type-notation/missing.rs
@@ -7,7 +7,7 @@ trait Trait {
async fn method() {}
}
-fn bar<T: Trait<methid(): Send>>() {}
+fn bar<T: Trait<methid(..): Send>>() {}
//~^ ERROR associated function `methid` not found for `Trait`
fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/missing.stderr b/tests/ui/associated-type-bounds/return-type-notation/missing.stderr
index db9cb9f49a305..5cb8e2642f51c 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/missing.stderr
+++ b/tests/ui/associated-type-bounds/return-type-notation/missing.stderr
@@ -10,7 +10,7 @@ LL | #![feature(return_type_notation)]
error[E0220]: associated function `methid` not found for `Trait`
--> $DIR/missing.rs:10:17
|
-LL | fn bar<T: Trait<methid(): Send>>() {}
+LL | fn bar<T: Trait<methid(..): Send>>() {}
| ^^^^^^ help: there is an associated function with a similar name: `method`
error: aborting due to 1 previous error; 1 warning emitted
diff --git a/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.rs b/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.rs
index db5f6fe389ea7..d283c6eab370d 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.rs
+++ b/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.rs
@@ -5,7 +5,7 @@ trait Trait {
fn method() {}
}
-fn test<T: Trait<method(): Send>>() {}
+fn test<T: Trait<method(..): Send>>() {}
//~^ ERROR return type notation used on function that is not `async` and does not return `impl Trait`
fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.stderr b/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.stderr
index 3e307c5f42ca4..79ced3c96ed5c 100644
--- a/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.stderr
+++ b/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.stderr
@@ -13,8 +13,8 @@ error: return type notation used on function that is not `async` and does not re
LL | fn method() {}
| ----------- this function must be `async` or return `impl Trait`
...
-LL | fn test<T: Trait<method(): Send>>() {}
- | ^^^^^^^^^^^^^^
+LL | fn test<T: Trait<method(..): Send>>() {}
+ | ^^^^^^^^^^^^^^^^
|
= note: function returns `()`, which is not compatible with associated type return bounds
diff --git a/tests/ui/async-await/return-type-notation/issue-110963-early.rs b/tests/ui/async-await/return-type-notation/issue-110963-early.rs
index 4090912f528c4..46b8fbf6f86e3 100644
--- a/tests/ui/async-await/return-type-notation/issue-110963-early.rs
+++ b/tests/ui/async-await/return-type-notation/issue-110963-early.rs
@@ -9,7 +9,7 @@ trait HealthCheck {
async fn do_health_check_par<HC>(hc: HC)
where
- HC: HealthCheck<check(): Send> + Send + 'static,
+ HC: HealthCheck<check(..): Send> + Send + 'static,
{
spawn(async move {
let mut hc = hc;
diff --git a/tests/ui/async-await/return-type-notation/issue-110963-late.rs b/tests/ui/async-await/return-type-notation/issue-110963-late.rs
index e0e59b6c6adb2..cb9c0b97f1e99 100644
--- a/tests/ui/async-await/return-type-notation/issue-110963-late.rs
+++ b/tests/ui/async-await/return-type-notation/issue-110963-late.rs
@@ -10,7 +10,7 @@ trait HealthCheck {
async fn do_health_check_par<HC>(hc: HC)
where
- HC: HealthCheck<check(): Send> + Send + 'static,
+ HC: HealthCheck<check(..): Send> + Send + 'static,
{
spawn(async move {
let mut hc = hc;
diff --git a/tests/ui/async-await/return-type-notation/normalizing-self-auto-trait-issue-109924.rs b/tests/ui/async-await/return-type-notation/normalizing-self-auto-trait-issue-109924.rs
index bee9ad2516ee2..24041ed080752 100644
--- a/tests/ui/async-await/return-type-notation/normalizing-self-auto-trait-issue-109924.rs
+++ b/tests/ui/async-await/return-type-notation/normalizing-self-auto-trait-issue-109924.rs
@@ -16,7 +16,7 @@ impl Foo for Bar {
async fn bar(&self) {}
}
-fn build<T>(_: T) where T: Foo<bar(): Send> {}
+fn build<T>(_: T) where T: Foo<bar(..): Send> {}
fn main() {
build(Bar);
diff --git a/tests/ui/async-await/return-type-notation/rtn-implied-in-supertrait.rs b/tests/ui/async-await/return-type-notation/rtn-implied-in-supertrait.rs
index 365ca57400652..2f6e04c385384 100644
--- a/tests/ui/async-await/return-type-notation/rtn-implied-in-supertrait.rs
+++ b/tests/ui/async-await/return-type-notation/rtn-implied-in-supertrait.rs
@@ -16,7 +16,7 @@ trait Foo {
async fn bar(&self) -> i32;
}
-trait SendFoo: Foo<bar(): Send> + Send {}
+trait SendFoo: Foo<bar(..): Send> + Send {}
fn foobar(foo: impl SendFoo) -> JoinHandle<i32> {
spawn(async move {
diff --git a/tests/ui/async-await/return-type-notation/rtn-in-impl-signature.rs b/tests/ui/async-await/return-type-notation/rtn-in-impl-signature.rs
index 637678692bd1f..1e971d0aea71d 100644
--- a/tests/ui/async-await/return-type-notation/rtn-in-impl-signature.rs
+++ b/tests/ui/async-await/return-type-notation/rtn-in-impl-signature.rs
@@ -7,7 +7,7 @@ trait Super1<'a> {
fn bar<'b>() -> bool;
}
-impl Super1<'_, bar(): Send> for () {}
+impl Super1<'_, bar(..): Send> for () {}
//~^ ERROR associated item constraints are not allowed here
//~| ERROR not all trait items implemented
diff --git a/tests/ui/async-await/return-type-notation/rtn-in-impl-signature.stderr b/tests/ui/async-await/return-type-notation/rtn-in-impl-signature.stderr
index 54960ae60bcca..b23dbc37a55cc 100644
--- a/tests/ui/async-await/return-type-notation/rtn-in-impl-signature.stderr
+++ b/tests/ui/async-await/return-type-notation/rtn-in-impl-signature.stderr
@@ -10,13 +10,13 @@ LL | #![feature(return_type_notation)]
error[E0229]: associated item constraints are not allowed here
--> $DIR/rtn-in-impl-signature.rs:10:17
|
-LL | impl Super1<'_, bar(): Send> for () {}
- | ^^^^^^^^^^^ associated item constraint not allowed here
+LL | impl Super1<'_, bar(..): Send> for () {}
+ | ^^^^^^^^^^^^^ associated item constraint not allowed here
|
help: consider removing this associated item constraint
|
-LL | impl Super1<'_, bar(): Send> for () {}
- | ~~~~~~~~~~~~~
+LL | impl Super1<'_, bar(..): Send> for () {}
+ | ~~~~~~~~~~~~~~~
error[E0046]: not all trait items implemented, missing: `bar`
--> $DIR/rtn-in-impl-signature.rs:10:1
@@ -24,8 +24,8 @@ error[E0046]: not all trait items implemented, missing: `bar`
LL | fn bar<'b>() -> bool;
| --------------------- `bar` from trait
...
-LL | impl Super1<'_, bar(): Send> for () {}
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `bar` in implementation
+LL | impl Super1<'_, bar(..): Send> for () {}
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `bar` in implementation
error: aborting due to 2 previous errors; 1 warning emitted
diff --git a/tests/ui/async-await/return-type-notation/super-method-bound-ambig.rs b/tests/ui/async-await/return-type-notation/super-method-bound-ambig.rs
index fa647ea0bc781..452568f3e4695 100644
--- a/tests/ui/async-await/return-type-notation/super-method-bound-ambig.rs
+++ b/tests/ui/async-await/return-type-notation/super-method-bound-ambig.rs
@@ -22,7 +22,7 @@ impl Foo for () {}
fn test<T>()
where
- T: Foo<test(): Send>,
+ T: Foo<test(..): Send>,
//~^ ERROR ambiguous associated function `test` in bounds of `Foo`
{
}
diff --git a/tests/ui/async-await/return-type-notation/super-method-bound-ambig.stderr b/tests/ui/async-await/return-type-notation/super-method-bound-ambig.stderr
index 4003aad6d03c3..9a6fdd7f2ac6b 100644
--- a/tests/ui/async-await/return-type-notation/super-method-bound-ambig.stderr
+++ b/tests/ui/async-await/return-type-notation/super-method-bound-ambig.stderr
@@ -16,8 +16,8 @@ LL | async fn test();
LL | async fn test();
| ---------------- ambiguous `test` from `Super2`
...
-LL | T: Foo<test(): Send>,
- | ^^^^^^^^^^^^ ambiguous associated function `test`
+LL | T: Foo<test(..): Send>,
+ | ^^^^^^^^^^^^^^ ambiguous associated function `test`
error: aborting due to 1 previous error; 1 warning emitted
diff --git a/tests/ui/async-await/return-type-notation/super-method-bound.rs b/tests/ui/async-await/return-type-notation/super-method-bound.rs
index ad7ed5b283cf1..1aa8258a09b7d 100644
--- a/tests/ui/async-await/return-type-notation/super-method-bound.rs
+++ b/tests/ui/async-await/return-type-notation/super-method-bound.rs
@@ -16,7 +16,7 @@ impl Foo for () {}
fn test<T>()
where
- T: Foo<test(): Send>,
+ T: Foo<test(..): Send>,
{
}
diff --git a/tests/ui/async-await/return-type-notation/supertrait-bound.rs b/tests/ui/async-await/return-type-notation/supertrait-bound.rs
index adb286a21d216..9c74c10b33319 100644
--- a/tests/ui/async-await/return-type-notation/supertrait-bound.rs
+++ b/tests/ui/async-await/return-type-notation/supertrait-bound.rs
@@ -6,6 +6,6 @@
trait IntFactory {
fn stream(&self) -> impl Iterator<Item = i32>;
}
-trait SendIntFactory: IntFactory<stream(): Send> + Send {}
+trait SendIntFactory: IntFactory<stream(..): Send> + Send {}
fn main() {}
diff --git a/tests/ui/async-await/return-type-notation/ty-or-ct-params.rs b/tests/ui/async-await/return-type-notation/ty-or-ct-params.rs
index 328cd8d2ad02e..06a966df4451a 100644
--- a/tests/ui/async-await/return-type-notation/ty-or-ct-params.rs
+++ b/tests/ui/async-await/return-type-notation/ty-or-ct-params.rs
@@ -11,7 +11,7 @@ trait Foo {
fn test<T>()
where
- T: Foo<bar(): Send, baz(): Send>,
+ T: Foo<bar(..): Send, baz(..): Send>,
//~^ ERROR return type notation is not allowed for functions that have const parameters
//~| ERROR return type notation is not allowed for functions that have type parameters
{
diff --git a/tests/ui/async-await/return-type-notation/ty-or-ct-params.stderr b/tests/ui/async-await/return-type-notation/ty-or-ct-params.stderr
index da94d9d1e6da4..1c000bc6c3318 100644
--- a/tests/ui/async-await/return-type-notation/ty-or-ct-params.stderr
+++ b/tests/ui/async-await/return-type-notation/ty-or-ct-params.stderr
@@ -13,17 +13,17 @@ error: return type notation is not allowed for functions that have type paramete
LL | async fn bar<T>() {}
| - type parameter declared here
...
-LL | T: Foo<bar(): Send, baz(): Send>,
- | ^^^^^^^^^^^
+LL | T: Foo<bar(..): Send, baz(..): Send>,
+ | ^^^^^^^^^^^^^
error: return type notation is not allowed for functions that have const parameters
- --> $DIR/ty-or-ct-params.rs:14:25
+ --> $DIR/ty-or-ct-params.rs:14:27
|
LL | async fn baz<const N: usize>() {}
| -------------- const parameter declared here
...
-LL | T: Foo<bar(): Send, baz(): Send>,
- | ^^^^^^^^^^^
+LL | T: Foo<bar(..): Send, baz(..): Send>,
+ | ^^^^^^^^^^^^^
error: aborting due to 2 previous errors; 1 warning emitted
diff --git a/tests/ui/borrowck/alias-liveness/rtn-static.rs b/tests/ui/borrowck/alias-liveness/rtn-static.rs
index 37f634a8e23cd..6aa5d8fc7a107 100644
--- a/tests/ui/borrowck/alias-liveness/rtn-static.rs
+++ b/tests/ui/borrowck/alias-liveness/rtn-static.rs
@@ -7,7 +7,7 @@ trait Foo {
fn borrow(&mut self) -> impl Sized + '_;
}
-fn live_past_borrow<T: Foo<borrow(): 'static>>(mut t: T) {
+fn live_past_borrow<T: Foo<borrow(..): 'static>>(mut t: T) {
let x = t.borrow();
drop(t);
drop(x);
@@ -15,7 +15,7 @@ fn live_past_borrow<T: Foo<borrow(): 'static>>(mut t: T) {
// Test that the `'_` item bound in `borrow` does not cause us to
// overlook the `'static` RTN bound.
-fn overlapping_mut<T: Foo<borrow(): 'static>>(mut t: T) {
+fn overlapping_mut<T: Foo<borrow(..): 'static>>(mut t: T) {
let x = t.borrow();
let x = t.borrow();
}
diff --git a/tests/ui/feature-gates/feature-gate-return_type_notation.cfg.stderr b/tests/ui/feature-gates/feature-gate-return_type_notation.cfg.stderr
index 41bd66b13e70d..18f46928fab54 100644
--- a/tests/ui/feature-gates/feature-gate-return_type_notation.cfg.stderr
+++ b/tests/ui/feature-gates/feature-gate-return_type_notation.cfg.stderr
@@ -1,33 +1,13 @@
error[E0658]: return type notation is experimental
- --> $DIR/feature-gate-return_type_notation.rs:14:17
+ --> $DIR/feature-gate-return_type_notation.rs:10:18
|
-LL | fn foo<T: Trait<m(): Send>>() {}
- | ^^^^^^^^^
+LL | fn foo<T: Trait<m(..): Send>>() {}
+ | ^^^^
|
= note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
= help: add `#![feature(return_type_notation)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
-error: parenthesized generic arguments cannot be used in associated type constraints
- --> $DIR/feature-gate-return_type_notation.rs:14:17
- |
-LL | fn foo<T: Trait<m(): Send>>() {}
- | ^--
- | |
- | help: remove these parentheses
-
-error: expected type, found function
- --> $DIR/feature-gate-return_type_notation.rs:14:17
- |
-LL | fn foo<T: Trait<m(): Send>>() {}
- | ^ unexpected function
- |
-note: the associated function is defined here
- --> $DIR/feature-gate-return_type_notation.rs:10:5
- |
-LL | async fn m();
- | ^^^^^^^^^^^^^
-
-error: aborting due to 3 previous errors
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/feature-gates/feature-gate-return_type_notation.no.stderr b/tests/ui/feature-gates/feature-gate-return_type_notation.no.stderr
index 79c626cef35dc..18f46928fab54 100644
--- a/tests/ui/feature-gates/feature-gate-return_type_notation.no.stderr
+++ b/tests/ui/feature-gates/feature-gate-return_type_notation.no.stderr
@@ -1,14 +1,13 @@
-warning: return type notation is experimental
- --> $DIR/feature-gate-return_type_notation.rs:14:17
+error[E0658]: return type notation is experimental
+ --> $DIR/feature-gate-return_type_notation.rs:10:18
|
-LL | fn foo<T: Trait<m(): Send>>() {}
- | ^^^^^^^^^
+LL | fn foo<T: Trait<m(..): Send>>() {}
+ | ^^^^
|
= note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
= help: add `#![feature(return_type_notation)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
- = warning: unstable syntax can change at any point in the future, causing a hard error!
- = note: for more information, see issue #65860 <https://github.com/rust-lang/rust/issues/65860>
-warning: 1 warning emitted
+error: aborting due to 1 previous error
+For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/feature-gates/feature-gate-return_type_notation.rs b/tests/ui/feature-gates/feature-gate-return_type_notation.rs
index 7ae6cd0234be3..254b794e431e9 100644
--- a/tests/ui/feature-gates/feature-gate-return_type_notation.rs
+++ b/tests/ui/feature-gates/feature-gate-return_type_notation.rs
@@ -1,21 +1,13 @@
//@ edition: 2021
//@ revisions: cfg no
-//@ [no] check-pass
-// Since we're not adding new syntax, `cfg`'d out RTN must pass.
-
-
trait Trait {
#[allow(async_fn_in_trait)]
async fn m();
}
#[cfg(cfg)]
-fn foo<T: Trait<m(): Send>>() {}
-//[cfg]~^ ERROR return type notation is experimental
-//[cfg]~| ERROR parenthesized generic arguments cannot be used in associated type constraints
-//[cfg]~| ERROR expected type, found function
-//[no]~^^^^ WARN return type notation is experimental
-//[no]~| WARN unstable syntax can change at any point in the future, causing a hard error!
+fn foo<T: Trait<m(..): Send>>() {}
+//~^ ERROR return type notation is experimental
fn main() {}