Rollup of 21 pull requests #145034

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1203,6 +1203,12 @@ version = "1.0.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"

	[[package]]
	name = "dyn-clone"
	version = "1.0.19"
	source = "registry+https://github.com/rust-lang/crates.io-index"
	checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"

		[[package]]
		name = "either"
		version = "1.15.0"
Expand Down Expand Up		@@ -3196,6 +3202,26 @@ dependencies = [
		"thiserror 2.0.12",
		]

	[[package]]
	name = "ref-cast"
	version = "1.0.24"
	source = "registry+https://github.com/rust-lang/crates.io-index"
	checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
	dependencies = [
	"ref-cast-impl",
	]

	[[package]]
	name = "ref-cast-impl"
	version = "1.0.24"
	source = "registry+https://github.com/rust-lang/crates.io-index"
	checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
	dependencies = [
	"proc-macro2",
	"quote",
	"syn 2.0.104",
	]

		[[package]]
		name = "regex"
		version = "1.11.1"
Expand Down Expand Up		@@ -4650,6 +4676,7 @@ dependencies = [
		"rustc_macros",
		"rustc_serialize",
		"rustc_span",
	"schemars",
		"serde",
		"serde_derive",
		"serde_json",
Expand Down Expand Up		@@ -4964,6 +4991,31 @@ dependencies = [
		"windows-sys 0.59.0",
		]

	[[package]]
	name = "schemars"
	version = "1.0.4"
	source = "registry+https://github.com/rust-lang/crates.io-index"
	checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
	dependencies = [
	"dyn-clone",
	"ref-cast",
	"schemars_derive",
	"serde",
	"serde_json",
	]

	[[package]]
	name = "schemars_derive"
	version = "1.0.4"
	source = "registry+https://github.com/rust-lang/crates.io-index"
	checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
	dependencies = [
	"proc-macro2",
	"quote",
	"serde_derive_internals",
	"syn 2.0.104",
	]

		[[package]]
		name = "scoped-tls"
		version = "1.0.1"
Expand Down Expand Up		@@ -5038,6 +5090,17 @@ dependencies = [
		"syn 2.0.104",
		]

	[[package]]
	name = "serde_derive_internals"
	version = "0.29.1"
	source = "registry+https://github.com/rust-lang/crates.io-index"
	checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
	dependencies = [
	"proc-macro2",
	"quote",
	"syn 2.0.104",
	]

		[[package]]
		name = "serde_json"
		version = "1.0.142"
Expand Down

2 changes: 1 addition & 1 deletion compiler/rustc_ast_passes/messages.ftl

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,7 +40,7 @@ ast_passes_auto_generic = auto traits cannot have generic parameters

		ast_passes_auto_items = auto traits cannot have associated items
		.label = {ast_passes_auto_items}
	.suggestion = remove these associated items
	.suggestion = remove the associated items

		ast_passes_auto_super_lifetime = auto traits cannot have super traits or lifetime bounds
		.label = {ast_passes_auto_super_lifetime}
Expand Down

16 changes: 10 additions & 6 deletions compiler/rustc_ast_passes/src/ast_validation.rs

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -699,19 +699,23 @@ impl<'a> AstValidator<'a> {
		}
		}

	fn deny_super_traits(&self, bounds: &GenericBounds, ident_span: Span) {
	fn deny_super_traits(&self, bounds: &GenericBounds, ident: Span) {
		if let [.., last] = &bounds[..] {
	let span = ident_span.shrink_to_hi().to(last.span());
	self.dcx().emit_err(errors::AutoTraitBounds { span, ident: ident_span });
	let span = bounds.iter().map(\|b\| b.span()).collect();
	let removal = ident.shrink_to_hi().to(last.span());
	self.dcx().emit_err(errors::AutoTraitBounds { span, removal, ident });
		}
		}

	fn deny_where_clause(&self, where_clause: &WhereClause, ident_span: Span) {
	fn deny_where_clause(&self, where_clause: &WhereClause, ident: Span) {
		if !where_clause.predicates.is_empty() {
		// FIXME: The current diagnostic is misleading since it only talks about
		// super trait and lifetime bounds while we should just say "bounds".
	self.dcx()
	.emit_err(errors::AutoTraitBounds { span: where_clause.span, ident: ident_span });
	self.dcx().emit_err(errors::AutoTraitBounds {
	span: vec![where_clause.span],
	removal: where_clause.span,
	ident,
	});
		}
		}

Expand Down

9 changes: 5 additions & 4 deletions compiler/rustc_ast_passes/src/errors.rs

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -344,7 +344,7 @@ pub(crate) struct ModuleNonAscii {
		#[diag(ast_passes_auto_generic, code = E0567)]
		pub(crate) struct AutoTraitGeneric {
		#[primary_span]
	#[suggestion(code = "", applicability = "machine-applicable")]
	#[suggestion(code = "", applicability = "machine-applicable", style = "tool-only")]
		pub span: Span,
		#[label]
		pub ident: Span,
Expand All		@@ -354,8 +354,9 @@ pub(crate) struct AutoTraitGeneric {
		#[diag(ast_passes_auto_super_lifetime, code = E0568)]
		pub(crate) struct AutoTraitBounds {
		#[primary_span]
	#[suggestion(code = "", applicability = "machine-applicable")]
	pub span: Span,
	pub span: Vec<Span>,
	#[suggestion(code = "", applicability = "machine-applicable", style = "tool-only")]
	pub removal: Span,
		#[label]
		pub ident: Span,
		}
Expand All		@@ -365,7 +366,7 @@ pub(crate) struct AutoTraitBounds {
		pub(crate) struct AutoTraitItems {
		#[primary_span]
		pub spans: Vec<Span>,
	#[suggestion(code = "", applicability = "machine-applicable")]
	#[suggestion(code = "", applicability = "machine-applicable", style = "tool-only")]
		pub total: Span,
		#[label]
		pub ident: Span,
Expand Down

52 changes: 52 additions & 0 deletions compiler/rustc_attr_parsing/src/attributes/test_attrs.rs

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,55 @@ impl<S: Stage> SingleAttributeParser<S> for IgnoreParser {
		})
		}
		}

	pub(crate) struct ShouldPanicParser;

	impl<S: Stage> SingleAttributeParser<S> for ShouldPanicParser {
	const PATH: &[Symbol] = &[sym::should_panic];
	const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepOutermost;
	const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::WarnButFutureError;
	const TEMPLATE: AttributeTemplate =
	template!(Word, List: r#"expected = "reason""#, NameValueStr: "reason");

	fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
	Some(AttributeKind::ShouldPanic {
	span: cx.attr_span,
	reason: match args {
	ArgParser::NoArgs => None,
	ArgParser::NameValue(name_value) => {
	let Some(str_value) = name_value.value_as_str() else {
	cx.expected_string_literal(
	name_value.value_span,
	Some(name_value.value_as_lit()),
	);
	return None;
	};
	Some(str_value)
	}
	ArgParser::List(list) => {
	let Some(single) = list.single() else {
	cx.expected_single_argument(list.span);
	return None;
	};
	let Some(single) = single.meta_item() else {
	cx.expected_name_value(single.span(), Some(sym::expected));
	return None;
	};
	if !single.path().word_is(sym::expected) {
	cx.expected_specific_argument_strings(list.span, vec!["expected"]);
	return None;
	}
	let Some(nv) = single.args().name_value() else {
	cx.expected_name_value(single.span(), Some(sym::expected));
	return None;
	};
	let Some(expected) = nv.value_as_str() else {
	cx.expected_string_literal(nv.value_span, Some(nv.value_as_lit()));
	return None;
	};
	Some(expected)
	}
	},
	})
	}
	}

3 changes: 2 additions & 1 deletion compiler/rustc_attr_parsing/src/context.rs

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -50,7 +50,7 @@ use crate::attributes::semantics::MayDangleParser;
		use crate::attributes::stability::{
		BodyStabilityParser, ConstStabilityIndirectParser, ConstStabilityParser, StabilityParser,
		};
	use crate::attributes::test_attrs::IgnoreParser;
	use crate::attributes::test_attrs::{IgnoreParser, ShouldPanicParser};
		use crate::attributes::traits::{
		AllowIncoherentImplParser, CoherenceIsCoreParser, CoinductiveParser, ConstTraitParser,
		DenyExplicitImplParser, DoNotImplementViaObjectParser, FundamentalParser, MarkerParser,
Expand Down Expand Up		@@ -174,6 +174,7 @@ attribute_parsers!(
		Single<RustcLayoutScalarValidRangeEnd>,
		Single<RustcLayoutScalarValidRangeStart>,
		Single<RustcObjectLifetimeDefaultParser>,
	Single<ShouldPanicParser>,
		Single<SkipDuringMethodDispatchParser>,
		Single<TransparencyParser>,
		Single<WithoutArgs<AllowIncoherentImplParser>>,
Expand Down

51 changes: 17 additions & 34 deletions compiler/rustc_builtin_macros/src/test.rs

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,10 +5,13 @@ use std::assert_matches::assert_matches;
		use std::iter;

		use rustc_ast::ptr::P;
	use rustc_ast::{self as ast, GenericParamKind, attr, join_path_idents};
	use rustc_ast::{self as ast, GenericParamKind, HasNodeId, attr, join_path_idents};
		use rustc_ast_pretty::pprust;
	use rustc_attr_parsing::AttributeParser;
		use rustc_errors::{Applicability, Diag, Level};
		use rustc_expand::base::*;
	use rustc_hir::Attribute;
	use rustc_hir::attrs::AttributeKind;
		use rustc_span::{ErrorGuaranteed, FileNameDisplayPreference, Ident, Span, Symbol, sym};
		use thin_vec::{ThinVec, thin_vec};
		use tracing::debug;
Expand Down Expand Up		@@ -473,39 +476,19 @@ fn should_ignore_message(i: &ast::Item) -> Option<Symbol> {
		}

		fn should_panic(cx: &ExtCtxt<'_>, i: &ast::Item) -> ShouldPanic {
	match attr::find_by_name(&i.attrs, sym::should_panic) {
	Some(attr) => {
	match attr.meta_item_list() {
	// Handle #[should_panic(expected = "foo")]
	Some(list) => {
	let msg = list
	.iter()
	.find(\|mi\| mi.has_name(sym::expected))
	.and_then(\|mi\| mi.meta_item())
	.and_then(\|mi\| mi.value_str());
	if list.len() != 1 \|\| msg.is_none() {
	cx.dcx()
	.struct_span_warn(
	attr.span,
	"argument must be of the form: \
	`expected = \"error message\"`",
	)
	.with_note(
	"errors in this attribute were erroneously \
	allowed and will become a hard error in a \
	future release",
	)
	.emit();
	ShouldPanic::Yes(None)
	} else {
	ShouldPanic::Yes(msg)
	}
	}
	// Handle #[should_panic] and #[should_panic = "expected"]
	None => ShouldPanic::Yes(attr.value_str()),
	}
	}
	None => ShouldPanic::No,
	if let Some(Attribute::Parsed(AttributeKind::ShouldPanic { reason, .. })) =
	AttributeParser::parse_limited(
	cx.sess,
	&i.attrs,
	sym::should_panic,
	i.span,
	i.node_id(),
	None,
	)
	{
	ShouldPanic::Yes(reason)
	} else {
	ShouldPanic::No
		}
		}

Expand Down

3 changes: 1 addition & 2 deletions compiler/rustc_codegen_gcc/src/debuginfo.rs

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -254,8 +254,7 @@ impl<'gcc, 'tcx> DebugInfoCodegenMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
		// TODO(antoyo): implement.
		}

	fn debuginfo_finalize(&mut self) {
	// TODO: emit section `.debug_gdb_scripts`.
	fn debuginfo_finalize(&self) {
		self.context.set_debug_info(true)
		}

Expand Down

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 21 pull requests #145034

Uh oh!

Rollup of 21 pull requests #145034

Filter by extension

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!