Commitf54c557

committed

Auto merge ofrust-lang#125518 - saethlin:check-arguments-new-in-const, r=joboet

Move the checks for Arguments constructors to inline constThanks `@Skgland` for pointing out this opportunity:rust-lang#117804 (comment)

2 parentsbf3ca98 +29a1b3b commitf54c557Copy full SHA for f54c557

File tree

-11

lines changed

-11

lines changed

Lines changed: 7 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -338,23 +338,19 @@ pub struct Arguments<'a> {`
`338`	`338`	`impl<'a>Arguments<'a>{`
`339`	`339`	`#[inline]`
`340`	`340`	`#[rustc_const_unstable(feature ="const_fmt_arguments_new", issue ="none")]`
`341`		`-pubconstfnnew_const(pieces:&'a[&'staticstr]) ->Self{`
`342`		`-if pieces.len() >1{`
`343`		`-// Since panic!() expands to panic_fmt(format_args!()), using panic! here is both a`
`344`		`-// bit silly and also significantly increases the amount of MIR generated by panics.`
`345`		`-crate::panicking::panic_nounwind("invalid args");`
`346`		`-}`
	`341`	`+pubconstfnnew_const<constN:usize>(pieces:&'a[&'staticstr;N]) ->Self{`
	`342`	`+const{assert!(N <=1)};`
`347`	`343`	`Arguments{ pieces,fmt:None,args:&[]}`
`348`	`344`	`}`
`349`	`345`
`350`	`346`	`/// When using the format_args!() macro, this function is used to generate the`
`351`	`347`	`/// Arguments structure.`
`352`	`348`	`#[inline]`
`353`		`-pubfnnew_v1(pieces:&'a[&'staticstr],args:&'a[rt::Argument<'a>]) ->Arguments<'a>{`
`354`		`-ifpieces.len() < args.len() \|\| pieces.len() > args.len() +1{`
`355`		`-// See Arguments::new_const for why we don't use panic!.`
`356`		`-crate::panicking::panic_nounwind("invalid args");`
`357`		`-}`
	`349`	`+pubfnnew_v1<constP:usize,constA:usize>(`
	`350`	`+pieces:&'a[&'staticstr;P],`
	`351`	`+args:&'a[rt::Argument<'a>;A],`
	`352`	`+) ->Arguments<'a>{`
	`353`	`+const{assert!(P >=A &&P <=A +1,"invalid args")}`
`358`	`354`	`Arguments{ pieces,fmt:None, args}`
`359`	`355`	`}`
`360`	`356`

Comments

(0)