diff options
| author | bors <bors@rust-lang.org> | 2023-12-06 17:59:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-06 17:59:19 +0000 |
| commit | 7a34091eed9adcb079035357ffaf2467b0d377fc (patch) | |
| tree | dbcd0471e6455fea7861113f149525ef59d107ad /compiler/rustc_span/src | |
| parent | f32d29837d3642475e23716cd8af5711d00c01ae (diff) | |
| parent | 2f71a448c0c7566f77d4ffaaf056581fab6748ea (diff) | |
| download | rust-7a34091eed9adcb079035357ffaf2467b0d377fc.tar.gz rust-7a34091eed9adcb079035357ffaf2467b0d377fc.zip | |
Auto merge of #118679 - matthiaskrgr:rollup-zr1l9w6, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #116496 (Provide context when `?` can't be called because of `Result<_, E>`) - #117563 (docs: clarify explicitly freeing heap allocated memory) - #117874 (`riscv32` platform support) - #118516 (Add ADT variant infomation to StableMIR and finish implementing TyKind::internal()) - #118650 (add comment about keeping flags in sync between bootstrap.py and bootstrap.rs) - #118664 (docs: remove #110800 from release notes) - #118669 (library: fix comment about const assert in win api) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 2809aaed43c..d64f7f6db48 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -973,6 +973,7 @@ symbols! { managed_boxes, manually_drop, map, + map_err, marker, marker_trait_attr, masked, @@ -1137,6 +1138,7 @@ symbols! { offset, offset_of, offset_of_enum, + ok_or_else, omit_gdb_pretty_printer_section, on, on_unimplemented, |