diff options
| author | bors <bors@rust-lang.org> | 2023-08-08 02:27:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-08 02:27:38 +0000 |
| commit | 8e7fd551311d424e4e63fa45906a2a928fce96a7 (patch) | |
| tree | d3afa2d901c697b08d0039dee07833fd15f48e47 /compiler/rustc_passes/src/errors.rs | |
| parent | 443c3161dd04f4c1b656a626f9079921bee9c326 (diff) | |
| parent | 07b2c971a1f9a2db803bb93e6751f8a451fc664d (diff) | |
| download | rust-8e7fd551311d424e4e63fa45906a2a928fce96a7.tar.gz rust-8e7fd551311d424e4e63fa45906a2a928fce96a7.zip | |
Auto merge of #114604 - matthiaskrgr:rollup-o1jltfn, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #114376 (Avoid exporting __rust_alloc_error_handler_should_panic more than once.) - #114413 (Warn when #[macro_export] is applied on decl macros) - #114497 (Revert #98333 "Re-enable atomic loads and stores for all RISC-V targets") - #114500 (Remove arm crypto target feature) - #114566 (Store the laziness of type aliases in their `DefKind`) - #114594 (Structurally normalize weak and inherent in new solver) - #114596 (Rename method in `opt-dist`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_passes/src/errors.rs')
| -rw-r--r-- | compiler/rustc_passes/src/errors.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_passes/src/errors.rs b/compiler/rustc_passes/src/errors.rs index 4f5514372d1..683717344ce 100644 --- a/compiler/rustc_passes/src/errors.rs +++ b/compiler/rustc_passes/src/errors.rs @@ -690,6 +690,10 @@ pub enum MacroExport { #[diag(passes_macro_export)] Normal, + #[diag(passes_macro_export_on_decl_macro)] + #[note] + OnDeclMacro, + #[diag(passes_invalid_macro_export_arguments)] UnknownItem { name: Symbol }, |