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

Auto merge of #136225 - fmease:rollup-fm7m744, r=fmease

Browse Source 
Rollup of 7 pull requests

Successful merges:

 - #135625 ([cfg_match] Document the use of expressions.)
 - #135902 (Do not consider child bound assumptions for rigid alias)
 - #135943 (Rename `Piece::String` to `Piece::Lit`)
 - #136104 (Add mermaid graphs of NLL regions and SCCs to polonius MIR dump)
 - #136143 (Update books)
 - #136147 (ABI-required target features: warn when they are missing in base CPU)
 - #136164 (Refactor FnKind variant to hold &Fn)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2025-01-29 05:00:20 +00:00
commit 048b31dee6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/hir-def/src/body/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) => {