diff options
| author | bors <bors@rust-lang.org> | 2025-04-14 07:07:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-14 07:07:54 +0000 |
| commit | 5961e5ba3daa20d98f549eb9029105ae50c13aed (patch) | |
| tree | 4ac1a50a6878c637f7dea0a76b02ba4f2fb79983 /compiler/rustc_ast | |
| parent | f836ae4e663b6e8938096b8559e094d18361be55 (diff) | |
| parent | b06f38c2ab0f2f89938d81120db778857aaa4a38 (diff) | |
| download | rust-5961e5ba3daa20d98f549eb9029105ae50c13aed.tar.gz rust-5961e5ba3daa20d98f549eb9029105ae50c13aed.zip | |
Auto merge of #139781 - jhpratt:rollup-qadsjvb, r=jhpratt
Rollup of 9 pull requests
Successful merges:
- #138336 (Improve `-Z crate-attr` diagnostics)
- #139636 (Encode dep node edge count as u32 instead of usize)
- #139666 (cleanup `mir_borrowck`)
- #139695 (compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout)
- #139699 (Proactively update coroutine drop shim's phase to account for later passes applied during shim query)
- #139718 (enforce unsafe attributes in pre-2024 editions by default)
- #139722 (Move some things to rustc_type_ir)
- #139760 (UI tests: migrate remaining compile time `error-pattern`s to line annotations when possible)
- #139776 (Switch attrs to `diagnostic::on_unimplemented`)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_ast')
| -rw-r--r-- | compiler/rustc_ast/src/attr/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_ast/src/attr/mod.rs b/compiler/rustc_ast/src/attr/mod.rs index 0b65246693d..d656d9b0b8a 100644 --- a/compiler/rustc_ast/src/attr/mod.rs +++ b/compiler/rustc_ast/src/attr/mod.rs @@ -627,7 +627,7 @@ pub fn mk_doc_comment( Attribute { kind: AttrKind::DocComment(comment_kind, data), id: g.mk_attr_id(), style, span } } -pub fn mk_attr( +fn mk_attr( g: &AttrIdGenerator, style: AttrStyle, unsafety: Safety, |