mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2398 from dtolnay/borrow

Browse Source 
Treat field-level borrow attr as duplicate of variant-level borrow attr
This commit is contained in:
David Tolnay 2023-03-11 11:24:50 -08:00 committed by GitHub
commit 696f6f56db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
serde_derive/src/internals/attr.rs
View File

@ -1114,13 +1114,13 @@ impl Field {
.and_then(|variant| variant.borrow.as_ref()) .and_then(|variant| variant.borrow.as_ref())
.map(|borrow| Meta(borrow.clone())); .map(|borrow| Meta(borrow.clone()));
for meta_item in field for meta_item in variant_borrow.into_iter().chain(
field
.attrs .attrs
.iter() .iter()
.flat_map(|attr| get_serde_meta_items(cx, attr)) .flat_map(|attr| get_serde_meta_items(cx, attr))
.flatten() .flatten(),
.chain(variant_borrow) ) {
{
match &meta_item { match &meta_item {
// Parse `#[serde(rename = "foo")]` // Parse `#[serde(rename = "foo")]`
Meta(NameValue(m)) if m.path == RENAME => { Meta(NameValue(m)) if m.path == RENAME => {

4
test_suite/tests/ui/borrow/duplicate_variant.stderr
View File

@ -1,5 +1,5 @@
error: duplicate serde attribute `borrow` error: duplicate serde attribute `borrow`
--> tests/ui/borrow/duplicate_variant.rs:8:13 --> tests/ui/borrow/duplicate_variant.rs:9:15
| |
8 | #[serde(borrow)] 9 | S(#[serde(borrow)] Str<'a>),
| ^^^^^^ | ^^^^^^