Commit2ff9bab

committed

fix: Fix format_args lowering passing incorrect parameters to rustc_parse_format

1 parent9f4b651 commit2ff9babCopy full SHA for 2ff9bab

File tree

+18

-6

lines changed

+18

-6

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ use syntax::{`
`17`	`17`	`self,ArrayExprKind,AstChildren,BlockExpr,HasArgList,HasAttrs,HasLoopBody,HasName,`
`18`	`18`	`RangeItem,SlicePatComponents,`
`19`	`19`	`},`
`20`		`-AstNode,AstPtr,SyntaxNodePtr,`
	`20`	`+AstNode,AstPtr,AstTokenas _,SyntaxNodePtr,`
`21`	`21`	`};`
`22`	`22`	`use triomphe::Arc;`
`23`	`23`
`@@ -1577,7 +1577,13 @@ impl ExprCollector<'_> {`
`1577`	`1577`	`});`
`1578`	`1578`	`});`
`1579`	`1579`	`let template = f.template();`
`1580`		`-let fmt_snippet = template.as_ref().map(ToString::to_string);`
	`1580`	`+let fmt_snippet = template.as_ref().and_then(\|it\|match it{`
	`1581`	`+ ast::Expr::Literal(literal) =>match literal.kind(){`
	`1582`	`+ ast::LiteralKind::String(s) =>Some(s.text().to_owned()),`
	`1583`	`+ _ =>None,`
	`1584`	`+},`
	`1585`	`+ _ =>None,`
	`1586`	`+});`
`1581`	`1587`	`letmut mappings =vec![];`
`1582`	`1588`	`let fmt =match template.and_then(\|it\|self.expand_macros_to_string(it)){`
`1583`	`1589`	`Some((s, is_direct_literal)) => format_args::parse(`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ fn desugar_builtin_format_args() {`
`150`	`150`	`fn main() {`
`151`	`151`	`let are = "are";`
`152`	`152`	`let count = 10;`
`153`		`- builtin#format_args("hello {count:02} {} friends, we {are:?} {0}{last}", "fancy", last = "!");`
	`153`	`+ builtin#format_args("\u{1b}hello {count:02} {} friends, we {are:?} {0}{last}", "fancy", last = "!");`
`154`	`154`	`}`
`155`	`155`	`"#,`
`156`	`156`	`);`
`@@ -161,7 +161,7 @@ fn main() {`
`161`	`161`	`let count = 10;`
`162`	`162`	`builtin#lang(Arguments::new_v1_formatted)(`
`163`	`163`	`&[`
`164`		`- "hello ", " ", " friends, we ", " ", "",`
	`164`	`+ "\u{1b}hello ", " ", " friends, we ", " ", "",`
`165`	`165`	`],`
`166`	`166`	`&[`
`167`	`167`	`builtin#lang(Argument::new_display)(`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,13 @@ pub(crate) fn parse(`
`175`	`175`	`mutsynth:implFnMut(Name) ->ExprId,`
`176`	`176`	`mutrecord_usage:implFnMut(Name,Option<TextRange>),`
`177`	`177`	`) ->FormatArgs{`
`178`		`-let text = s.text_without_quotes();`
	`178`	`+letOk(text) = s.value()else{`
	`179`	`+returnFormatArgs{`
	`180`	`+template:Default::default(),`
	`181`	`+arguments: args.finish(),`
	`182`	`+orphans:vec![],`
	`183`	`+};`
	`184`	`+};`
`179`	`185`	`let str_style =match s.quote_offsets(){`
`180`	`186`	`Some(offsets) =>{`
`181`	`187`	`let raw = usize::from(offsets.quotes.0.len()) -1;`
`@@ -186,7 +192,7 @@ pub(crate) fn parse(`
`186`	`192`	`};`
`187`	`193`
`188`	`194`	`letmut parser =`
`189`		`- parse::Parser::new(text, str_style, fmt_snippet,false, parse::ParseMode::Format);`
	`195`	`+ parse::Parser::new(&text, str_style, fmt_snippet,false, parse::ParseMode::Format);`
`190`	`196`
`191`	`197`	`letmut pieces =Vec::new();`
`192`	`198`	`whileletSome(piece) = parser.next(){`

Comments

(0)