format safety keywords on static items · rust-lang/rust@30cdc2b (original) (raw)
`@@ -1915,6 +1915,7 @@ pub(crate) fn rewrite_struct_field(
`
1915
1915
``
1916
1916
`pub(crate) struct StaticParts<'a> {
`
1917
1917
`prefix: &'a str,
`
``
1918
`+
safety: ast::Safety,
`
1918
1919
`vis: &'a ast::Visibility,
`
1919
1920
`ident: symbol::Ident,
`
1920
1921
`ty: &'a ast::Ty,
`
`@@ -1926,11 +1927,12 @@ pub(crate) struct StaticParts<'a> {
`
1926
1927
``
1927
1928
`impl<'a> StaticParts<'a> {
`
1928
1929
`pub(crate) fn from_item(item: &'a ast::Item) -> Self {
`
1929
``
`-
let (defaultness, prefix, ty, mutability, expr) = match &item.kind {
`
1930
``
`-
ast::ItemKind::Static(s) => (None, "static", &s.ty, s.mutability, &s.expr),
`
``
1930
`+
let (defaultness, prefix, safety, ty, mutability, expr) = match &item.kind {
`
``
1931
`+
ast::ItemKind::Static(s) => (None, "static", s.safety, &s.ty, s.mutability, &s.expr),
`
1931
1932
` ast::ItemKind::Const(c) => (
`
1932
1933
`Some(c.defaultness),
`
1933
1934
`"const",
`
``
1935
`+
ast::Safety::Default,
`
1934
1936
`&c.ty,
`
1935
1937
` ast::Mutability::Not,
`
1936
1938
`&c.expr,
`
`@@ -1939,6 +1941,7 @@ impl<'a> StaticParts<'a> {
`
1939
1941
`};
`
1940
1942
`StaticParts {
`
1941
1943
` prefix,
`
``
1944
`+
safety,
`
1942
1945
`vis: &item.vis,
`
1943
1946
`ident: item.ident,
`
1944
1947
` ty,
`
`@@ -1956,6 +1959,7 @@ impl<'a> StaticParts<'a> {
`
1956
1959
`};
`
1957
1960
`StaticParts {
`
1958
1961
`prefix: "const",
`
``
1962
`+
safety: ast::Safety::Default,
`
1959
1963
`vis: &ti.vis,
`
1960
1964
`ident: ti.ident,
`
1961
1965
` ty,
`
`@@ -1973,6 +1977,7 @@ impl<'a> StaticParts<'a> {
`
1973
1977
`};
`
1974
1978
`StaticParts {
`
1975
1979
`prefix: "const",
`
``
1980
`+
safety: ast::Safety::Default,
`
1976
1981
`vis: &ii.vis,
`
1977
1982
`ident: ii.ident,
`
1978
1983
` ty,
`
`@@ -1989,11 +1994,13 @@ fn rewrite_static(
`
1989
1994
`static_parts: &StaticParts<'_>,
`
1990
1995
`offset: Indent,
`
1991
1996
`) -> Option {
`
``
1997
`+
println!("rewriting static");
`
1992
1998
`let colon = colon_spaces(context.config);
`
1993
1999
`let mut prefix = format!(
`
1994
``
`-
"{}{}{} {}{}{}",
`
``
2000
`+
"{}{}{}{} {}{}{}",
`
1995
2001
` format_visibility(context, static_parts.vis),
`
1996
2002
` static_parts.defaultness.map_or("", format_defaultness),
`
``
2003
`+
format_safety(static_parts.safety),
`
1997
2004
` static_parts.prefix,
`
1998
2005
` format_mutability(static_parts.mutability),
`
1999
2006
` rewrite_ident(context, static_parts.ident),
`
`@@ -3338,10 +3345,12 @@ impl Rewrite for ast::ForeignItem {
`
3338
3345
`// FIXME(#21): we're dropping potential comments in between the
`
3339
3346
`// function kw here.
`
3340
3347
`let vis = format_visibility(context, &self.vis);
`
``
3348
`+
let safety = format_safety(static_foreign_item.safety);
`
3341
3349
`let mut_str = format_mutability(static_foreign_item.mutability);
`
3342
3350
`let prefix = format!(
`
3343
``
`-
"{}static {}{}:",
`
``
3351
`+
"{}{}static {}{}:",
`
3344
3352
` vis,
`
``
3353
`+
safety,
`
3345
3354
` mut_str,
`
3346
3355
` rewrite_ident(context, self.ident)
`
3347
3356
`);
`