Unnamed repository; edit this file 'description' to name the repository.
Merge from rust-lang/rust
Laurențiu Nicola 2025-02-10
parent 8124865 · parent 0df8bee · commit bf51af1
-rw-r--r--crates/hir-def/src/expr_store/lower/asm.rs2
-rw-r--r--crates/hir-def/src/hir/format_args.rs2
-rw-r--r--crates/hir-def/src/lang_item.rs1
-rw-r--r--crates/intern/src/symbol/symbols.rs1
4 files changed, 4 insertions, 2 deletions
diff --git a/crates/hir-def/src/expr_store/lower/asm.rs b/crates/hir-def/src/expr_store/lower/asm.rs
index ab3d104b27..032c18688e 100644
--- a/crates/hir-def/src/expr_store/lower/asm.rs
+++ b/crates/hir-def/src/expr_store/lower/asm.rs
@@ -229,7 +229,7 @@ impl ExprCollector<'_> {
};
for piece in unverified_pieces {
match piece {
- rustc_parse_format::Piece::String(_) => {}
+ rustc_parse_format::Piece::Lit(_) => {}
rustc_parse_format::Piece::NextArgument(arg) => {
// let span = arg_spans.next();
diff --git a/crates/hir-def/src/hir/format_args.rs b/crates/hir-def/src/hir/format_args.rs
index e64e498c17..28c824fd31 100644
--- a/crates/hir-def/src/hir/format_args.rs
+++ b/crates/hir-def/src/hir/format_args.rs
@@ -287,7 +287,7 @@ pub(crate) fn parse(
for piece in pieces {
match piece {
- parse::Piece::String(s) => {
+ parse::Piece::Lit(s) => {
unfinished_literal.push_str(s);
}
parse::Piece::NextArgument(arg) => {
diff --git a/crates/hir-def/src/lang_item.rs b/crates/hir-def/src/lang_item.rs
index 166e00c9d2..59f51db9f7 100644
--- a/crates/hir-def/src/lang_item.rs
+++ b/crates/hir-def/src/lang_item.rs
@@ -411,6 +411,7 @@ language_item_table! {
PanicLocation, sym::panic_location, panic_location, Target::Struct, GenericRequirement::None;
PanicImpl, sym::panic_impl, panic_impl, Target::Fn, GenericRequirement::None;
PanicCannotUnwind, sym::panic_cannot_unwind, panic_cannot_unwind, Target::Fn, GenericRequirement::Exact(0);
+ PanicNullPointerDereference, sym::panic_null_pointer_dereference, panic_null_pointer_dereference, Target::Fn, GenericRequirement::None;
/// libstd panic entry point. Necessary for const eval to be able to catch it
BeginPanic, sym::begin_panic, begin_panic_fn, Target::Fn, GenericRequirement::None;
diff --git a/crates/intern/src/symbol/symbols.rs b/crates/intern/src/symbol/symbols.rs
index a53da69d90..66553a2661 100644
--- a/crates/intern/src/symbol/symbols.rs
+++ b/crates/intern/src/symbol/symbols.rs
@@ -364,6 +364,7 @@ define_symbols! {
panic_location,
panic_misaligned_pointer_dereference,
panic_nounwind,
+ panic_null_pointer_dereference,
panic,
Param,
parse,