Skip to content

Commit 048b31d

Browse files
committed
Auto merge of #136225 - fmease:rollup-fm7m744, r=fmease
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
2 parents 7066f1a + 6000289 commit 048b31d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

crates/hir-def/src/body/lower/asm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl ExprCollector<'_> {
229229
};
230230
for piece in unverified_pieces {
231231
match piece {
232-
rustc_parse_format::Piece::String(_) => {}
232+
rustc_parse_format::Piece::Lit(_) => {}
233233
rustc_parse_format::Piece::NextArgument(arg) => {
234234
// let span = arg_spans.next();
235235

crates/hir-def/src/hir/format_args.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ pub(crate) fn parse(
287287

288288
for piece in pieces {
289289
match piece {
290-
parse::Piece::String(s) => {
290+
parse::Piece::Lit(s) => {
291291
unfinished_literal.push_str(s);
292292
}
293293
parse::Piece::NextArgument(arg) => {

0 commit comments

Comments
 (0)