itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 11:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from rust-lang/rust

Browse Source
This commit is contained in:
Laurențiu Nicola 2025-02-10 07:49:43 +02:00
commit bf51af1a6d
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/hir-def/src/expr_store/lower/asm.rs
View File

@ -229,7 +229,7 @@ impl ExprCollector<'_> {
}; };
for piece in unverified_pieces { for piece in unverified_pieces {
match piece { match piece {
rustc_parse_format::Piece::String(_) => {} rustc_parse_format::Piece::Lit(_) => {}
rustc_parse_format::Piece::NextArgument(arg) => { rustc_parse_format::Piece::NextArgument(arg) => {
// let span = arg_spans.next(); // let span = arg_spans.next();

2
crates/hir-def/src/hir/format_args.rs
View File

@ -287,7 +287,7 @@ pub(crate) fn parse(
for piece in pieces { for piece in pieces {
match piece { match piece {
parse::Piece::String(s) => { parse::Piece::Lit(s) => {
unfinished_literal.push_str(s); unfinished_literal.push_str(s);
} }
parse::Piece::NextArgument(arg) => { parse::Piece::NextArgument(arg) => {

1
crates/hir-def/src/lang_item.rs
View File

@ -411,6 +411,7 @@ language_item_table! {
PanicLocation, sym::panic_location, panic_location, Target::Struct, GenericRequirement::None; PanicLocation, sym::panic_location, panic_location, Target::Struct, GenericRequirement::None;
PanicImpl, sym::panic_impl, panic_impl, Target::Fn, 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); 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 /// 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; BeginPanic, sym::begin_panic, begin_panic_fn, Target::Fn, GenericRequirement::None;

1
crates/intern/src/symbol/symbols.rs
View File

@ -364,6 +364,7 @@ define_symbols! {
panic_location, panic_location,
panic_misaligned_pointer_dereference, panic_misaligned_pointer_dereference,
panic_nounwind, panic_nounwind,
panic_null_pointer_dereference,
panic, panic,
Param, Param,
parse, parse,