Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 33e2813

Browse files
committedMay 26, 2025·
Auto merge of #141561 - jhpratt:rollup-1yjbnkh, r=jhpratt
Rollup of 9 pull requests Successful merges: - #134696 (Implement `normalize_lexically`) - #138744 (Add methods to TCP and UDP sockets to modify hop limit (refresh of #94678)) - #140539 (Simplify `attribute_groups`) - #140863 ([rustdoc] Unify type aliases rendering with other ADT) - #140936 (Clarify WTF-8 safety docs) - #140952 (Specify that split_ascii_whitespace uses the same definition as is_ascii_whitespace) - #141472 (Attempt to improve the `std::fs::create_dir_all` docs related to atomicity) - #141502 (ci: move PR job x86_64-gnu-tools to codebuild) - #141559 (const-check: stop recommending the use of rustc_allow_const_fn_unstable) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9f8929f + 8fcd1a7 commit 33e2813

Some content is hidden

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

50 files changed

+997
-524
lines changed
 

‎compiler/rustc_attr_parsing/src/attributes/allow_unstable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::session_diagnostics;
1010

1111
pub(crate) struct AllowInternalUnstableParser;
1212
impl CombineAttributeParser for AllowInternalUnstableParser {
13-
const PATH: &'static [rustc_span::Symbol] = &[sym::allow_internal_unstable];
13+
const PATH: &'static [Symbol] = &[sym::allow_internal_unstable];
1414
type Item = (Symbol, Span);
1515
const CONVERT: ConvertFn<Self::Item> = AttributeKind::AllowInternalUnstable;
1616

@@ -24,7 +24,7 @@ impl CombineAttributeParser for AllowInternalUnstableParser {
2424

2525
pub(crate) struct AllowConstFnUnstableParser;
2626
impl CombineAttributeParser for AllowConstFnUnstableParser {
27-
const PATH: &'static [rustc_span::Symbol] = &[sym::rustc_allow_const_fn_unstable];
27+
const PATH: &'static [Symbol] = &[sym::rustc_allow_const_fn_unstable];
2828
type Item = Symbol;
2929
const CONVERT: ConvertFn<Self::Item> = AttributeKind::AllowConstFnUnstable;
3030

‎compiler/rustc_attr_parsing/src/attributes/deprecation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ fn get(
4242
}
4343

4444
impl SingleAttributeParser for DeprecationParser {
45-
const PATH: &'static [rustc_span::Symbol] = &[sym::deprecated];
45+
const PATH: &'static [Symbol] = &[sym::deprecated];
4646

47-
fn on_duplicate(cx: &AcceptContext<'_>, first_span: rustc_span::Span) {
47+
fn on_duplicate(cx: &AcceptContext<'_>, first_span: Span) {
4848
// FIXME(jdonszelmann): merge with errors from check_attrs.rs
4949
cx.emit_err(session_diagnostics::UnusedMultiple {
5050
this: cx.attr_span,

0 commit comments

Comments
 (0)
Please sign in to comment.