Release 1.0.69

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEERijF2Cz/ZdaBZKeK+boUO5X/bYIFAmcwUXUACgkQ+boUO5X/
 bYLChBAAiO3silasUL5uxnLNwC3r9IaprdnBHRr69V/7UFGcAWQEN/JMxl+klN4p
 /4J8cIJmOFvdR7slB7tEtgkb3P4H4UlO9QGmKcHc86W6TXDztthC2b4eaXKEEPRN
 lYxs92iaHBuDSZR7DQ8NjhnPwLFlhoePFGrThNscy7e7e2Qtf2RP4pEeOQwTKIM5
 KlBlgpFK+81hP7SruhZHiYMBkA4vbQvwqoRTw+Xszi+olDdnqEntM+ySgfbpbl1H
 Gdp7C3+FhTRMSJLofNvEzBTWYv4coOZoDhkEJgXLdRhVomkFIHHMFYiaG6ldXp7n
 95hd8KXOfGF41oLmfuPkWDdXgZYlawale4a+g4W9P4Aa8ecW6fW15EvrrZEPtyt7
 fVApcMWWn8s174u4inaE2v5FY2gs2lOlxPCVvRUPB16R1T8XJhSHi4VWgKKSo/Jo
 gDDLvP+pSRHrC9qIlnkP0XuSK5GjVdymGalUlyUe9JAXmxP90m9jUBYH15WTrTjn
 qf0g4KYh6YgOYnUKU3qbYdkNlipjR5I/ISknBgDXcNipGdG1UdBRkGTbA2IquewV
 XD/SGhQ8az35pY4SYQRf3yS33DbNNCcBovBQe3u+phHhinGzils6A8ehK5NduxzL
 jyRJlq9mvE7+gkTzozKUkJFLLiT7RP9DtQy+yOlos9sHvJQTsI8=
 =OL7Q
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEERijF2Cz/ZdaBZKeK+boUO5X/bYIFAmcwUicACgkQ+boUO5X/
 bYLv1A//bx+ux6KQd6+f8pAesRkXppDTtvSm0TNuMigFFBfXPE/JWlB995eOm1Wy
 LlECgl8hOEf4NF4eiqdgNiqa1n6sY8neqiMDjW4rwl4kaX8dDkBWVEX4Lym8Q3Xt
 9OcdiNQOdlVoimeFkizfjDEpYywaeleSNurQ1Id2P/VgWrhnaIRUymYzni+fS98H
 HCaAmlf+dfvyyiVNlikJAg/DrMCXKyiX4jVu8KZ6PHJvvfrbS/VXqrh9+tah1vxg
 u1DxChokNIllt0Fm+3laFYg/5WwSJuHdn1mJDkh1kWxmdryKIb4Y+dAx6Xp/6BKb
 YefRZGUlChrQzbhxTQ6F6GXZqMeV0JJKknYPQ7+Cm1kQDtYS7tCueiUWT/82ZFnD
 ETGKIFJuFxnV0YcX0cNCRGo/ZJW5rmnhIFMwYbIma4q9j7zg+Fwn9XHeXbdyX6lC
 99uB833bRah8VTL1n/kviLD12eYm7JbahFGluVlLEjFnDjI1oiCY4wNOEJ2let83
 CO4FGrA+JGa0DTp9e4zZjnG1ObxtgTVn2p5J6qwzsiczx2Bcw3GEEan254gMiDTo
 60w2+ZYYqZe8HWBBINTtUqDPHHfc1ZBIWQk8me7rJuMuH2fT8ihpoordc7YSa269
 taBtVxbQYRT3dIwf4LE7VOng+/IN6f7V6Y6aQZldR3t8cyugHYk=
 =6xu0
 -----END PGP SIGNATURE-----

Merge 1.x (1.0.69) into 2.x (master)
This commit is contained in:
David Tolnay 2024-11-09 22:25:11 -08:00
commit 2e43d26838
3 changed files with 29 additions and 1 deletions

View file

@ -2,7 +2,7 @@ use crate::ast::{ContainerKind, Field};
use crate::attr::{Display, Trait};
use crate::scan_expr::scan_expr;
use crate::unraw::{IdentUnraw, MemberUnraw};
use proc_macro2::{Delimiter, TokenStream};
use proc_macro2::{Delimiter, TokenStream, TokenTree};
use quote::{format_ident, quote, quote_spanned};
use std::collections::{BTreeSet, HashMap, HashSet};
use std::iter;
@ -225,6 +225,8 @@ fn fallback_explicit_named_args(input: ParseStream) -> Result<FmtArguments> {
let ident: IdentUnraw = input.parse()?;
input.parse::<Token![=]>()?;
args.named.insert(ident);
} else {
input.parse::<TokenTree>()?;
}
}

View file

@ -0,0 +1,7 @@
use thiserror::Error;
#[derive(Error, Debug)]
#[error("".yellow)]
pub struct ArgError;
fn main() {}

View file

@ -0,0 +1,19 @@
error: expected `,`, found `.`
--> tests/ui/expression-fallback.rs:4:11
|
4 | #[error("".yellow)]
| ^ expected `,`
error: argument never used
--> tests/ui/expression-fallback.rs:4:12
|
4 | #[error("".yellow)]
| -- ^^^^^^ argument never used
| |
| formatting specifier missing
error[E0425]: cannot find value `yellow` in this scope
--> tests/ui/expression-fallback.rs:4:12
|
4 | #[error("".yellow)]
| ^^^^^^ not found in this scope