File tree Expand file tree Collapse file tree 3 files changed +6
-34
lines changed Expand file tree Collapse file tree 3 files changed +6
-34
lines changed Original file line number Diff line number Diff line change @@ -1545,19 +1545,9 @@ fn err_expected(
1545
1545
}
1546
1546
1547
1547
enum Attribute < ' a > {
1548
- Since {
1549
- span : Span ,
1550
- version : Version ,
1551
- feature : Option < Id < ' a > > ,
1552
- } ,
1553
- Unstable {
1554
- span : Span ,
1555
- feature : Id < ' a > ,
1556
- } ,
1557
- Deprecated {
1558
- span : Span ,
1559
- version : Version ,
1560
- } ,
1548
+ Since { span : Span , version : Version } ,
1549
+ Unstable { span : Span , feature : Id < ' a > } ,
1550
+ Deprecated { span : Span , version : Version } ,
1561
1551
}
1562
1552
1563
1553
impl < ' a > Attribute < ' a > {
@@ -1571,18 +1561,10 @@ impl<'a> Attribute<'a> {
1571
1561
eat_id ( tokens, "version" ) ?;
1572
1562
tokens. expect ( Token :: Equals ) ?;
1573
1563
let ( _span, version) = parse_version ( tokens) ?;
1574
- let feature = if tokens. eat ( Token :: Comma ) ? {
1575
- eat_id ( tokens, "feature" ) ?;
1576
- tokens. expect ( Token :: Equals ) ?;
1577
- Some ( parse_id ( tokens) ?)
1578
- } else {
1579
- None
1580
- } ;
1581
1564
tokens. expect ( Token :: RightParen ) ?;
1582
1565
Attribute :: Since {
1583
1566
span : id. span ,
1584
1567
version,
1585
- feature,
1586
1568
}
1587
1569
}
1588
1570
"unstable" => {
Original file line number Diff line number Diff line change @@ -1386,28 +1386,20 @@ impl<'a> Resolver<'a> {
1386
1386
match attrs {
1387
1387
[ ] => Ok ( Stability :: Unknown ) ,
1388
1388
1389
- [ ast:: Attribute :: Since {
1390
- version, feature, ..
1391
- } ] => Ok ( Stability :: Stable {
1389
+ [ ast:: Attribute :: Since { version, .. } ] => Ok ( Stability :: Stable {
1392
1390
since : version. clone ( ) ,
1393
- feature : feature. as_ref ( ) . map ( |s| s. name . to_string ( ) ) ,
1394
1391
deprecated : None ,
1395
1392
} ) ,
1396
1393
1397
- [ ast:: Attribute :: Since {
1398
- version, feature, ..
1399
- } , ast:: Attribute :: Deprecated {
1394
+ [ ast:: Attribute :: Since { version, .. } , ast:: Attribute :: Deprecated {
1400
1395
version : deprecated,
1401
1396
..
1402
1397
} ]
1403
1398
| [ ast:: Attribute :: Deprecated {
1404
1399
version : deprecated,
1405
1400
..
1406
- } , ast:: Attribute :: Since {
1407
- version, feature, ..
1408
- } ] => Ok ( Stability :: Stable {
1401
+ } , ast:: Attribute :: Since { version, .. } ] => Ok ( Stability :: Stable {
1409
1402
since : version. clone ( ) ,
1410
- feature : feature. as_ref ( ) . map ( |s| s. name . to_string ( ) ) ,
1411
1403
deprecated : Some ( deprecated. clone ( ) ) ,
1412
1404
} ) ,
1413
1405
Original file line number Diff line number Diff line change @@ -845,8 +845,6 @@ pub enum Stability {
845
845
#[ cfg_attr( feature = "serde" , serde( serialize_with = "serialize_version" ) ) ]
846
846
#[ cfg_attr( feature = "serde" , serde( deserialize_with = "deserialize_version" ) ) ]
847
847
since : Version ,
848
- #[ cfg_attr( feature = "serde" , serde( skip_serializing_if = "Option::is_none" ) ) ]
849
- feature : Option < String > ,
850
848
#[ cfg_attr(
851
849
feature = "serde" ,
852
850
serde(
You can’t perform that action at this time.
0 commit comments