@@ -2029,30 +2029,30 @@ pub(crate) struct StaticParts<'a> {
2029
2029
2030
2030
impl < ' a > StaticParts < ' a > {
2031
2031
pub ( crate ) fn from_item ( item : & ' a ast:: Item ) -> Self {
2032
- let ( defaultness, prefix, safety, ident, ty, mutability, expr , generics) = match & item . kind
2033
- {
2034
- ast:: ItemKind :: Static ( s) => (
2035
- None ,
2036
- "static" ,
2037
- s. safety ,
2038
- s. ident ,
2039
- & s. ty ,
2040
- s. mutability ,
2041
- & s. expr ,
2042
- None ,
2043
- ) ,
2044
- ast:: ItemKind :: Const ( c) => (
2045
- Some ( c. defaultness ) ,
2046
- "const" ,
2047
- ast:: Safety :: Default ,
2048
- c. ident ,
2049
- & c. ty ,
2050
- ast:: Mutability :: Not ,
2051
- & c . expr ,
2052
- Some ( & c. generics ) ,
2053
- ) ,
2054
- _ => unreachable ! ( ) ,
2055
- } ;
2032
+ let ( defaultness, prefix, safety, ident, ty, mutability, expr_opt , generics) =
2033
+ match & item . kind {
2034
+ ast:: ItemKind :: Static ( s) => (
2035
+ None ,
2036
+ "static" ,
2037
+ s. safety ,
2038
+ s. ident ,
2039
+ & s. ty ,
2040
+ s. mutability ,
2041
+ s. expr . as_ref ( ) ,
2042
+ None ,
2043
+ ) ,
2044
+ ast:: ItemKind :: Const ( c) => (
2045
+ Some ( c. defaultness ) ,
2046
+ "const" ,
2047
+ ast:: Safety :: Default ,
2048
+ c. ident ,
2049
+ & c. ty ,
2050
+ ast:: Mutability :: Not ,
2051
+ c . body . as_ref ( ) . map ( |ct| & ct . value ) ,
2052
+ Some ( & c. generics ) ,
2053
+ ) ,
2054
+ _ => unreachable ! ( ) ,
2055
+ } ;
2056
2056
StaticParts {
2057
2057
prefix,
2058
2058
safety,
@@ -2061,15 +2061,15 @@ impl<'a> StaticParts<'a> {
2061
2061
generics,
2062
2062
ty,
2063
2063
mutability,
2064
- expr_opt : expr . as_ref ( ) ,
2064
+ expr_opt,
2065
2065
defaultness,
2066
2066
span : item. span ,
2067
2067
}
2068
2068
}
2069
2069
2070
2070
pub ( crate ) fn from_trait_item ( ti : & ' a ast:: AssocItem , ident : Ident ) -> Self {
2071
- let ( defaultness, ty, expr_opt , generics) = match & ti. kind {
2072
- ast:: AssocItemKind :: Const ( c) => ( c. defaultness , & c. ty , & c. expr , Some ( & c. generics ) ) ,
2071
+ let ( defaultness, ty, body_opt , generics) = match & ti. kind {
2072
+ ast:: AssocItemKind :: Const ( c) => ( c. defaultness , & c. ty , & c. body , Some ( & c. generics ) ) ,
2073
2073
_ => unreachable ! ( ) ,
2074
2074
} ;
2075
2075
StaticParts {
@@ -2080,15 +2080,15 @@ impl<'a> StaticParts<'a> {
2080
2080
generics,
2081
2081
ty,
2082
2082
mutability : ast:: Mutability :: Not ,
2083
- expr_opt : expr_opt . as_ref ( ) ,
2083
+ expr_opt : body_opt . as_ref ( ) . map ( |ct| & ct . value ) ,
2084
2084
defaultness : Some ( defaultness) ,
2085
2085
span : ti. span ,
2086
2086
}
2087
2087
}
2088
2088
2089
2089
pub ( crate ) fn from_impl_item ( ii : & ' a ast:: AssocItem , ident : Ident ) -> Self {
2090
- let ( defaultness, ty, expr , generics) = match & ii. kind {
2091
- ast:: AssocItemKind :: Const ( c) => ( c. defaultness , & c. ty , & c. expr , Some ( & c. generics ) ) ,
2090
+ let ( defaultness, ty, body , generics) = match & ii. kind {
2091
+ ast:: AssocItemKind :: Const ( c) => ( c. defaultness , & c. ty , & c. body , Some ( & c. generics ) ) ,
2092
2092
_ => unreachable ! ( ) ,
2093
2093
} ;
2094
2094
StaticParts {
@@ -2099,7 +2099,7 @@ impl<'a> StaticParts<'a> {
2099
2099
generics,
2100
2100
ty,
2101
2101
mutability : ast:: Mutability :: Not ,
2102
- expr_opt : expr . as_ref ( ) ,
2102
+ expr_opt : body . as_ref ( ) . map ( |ct| & ct . value ) ,
2103
2103
defaultness : Some ( defaultness) ,
2104
2104
span : ii. span ,
2105
2105
}
0 commit comments