Add support for crate shorthand for pub(crate)

Author: nrc

Cargo.lock

@@ -14,7 +14,7 @@ use std::borrow::Cow;
 use std::cmp::min;
 
 use syntax::{abi, ast, ptr, symbol};
-use syntax::ast::ImplItem;
+use syntax::ast::{CrateSugar, ImplItem};
 use syntax::codemap::{BytePos, Span};
 use syntax::visit;
 
@@ -1765,10 +1765,12 @@ fn rewrite_fn_base(
     }
 
     // Skip `pub(crate)`.
-    let lo_after_visibility = if let ast::Visibility::Crate(s) = fn_sig.visibility {
-        context.codemap.span_after(mk_sp(s.hi(), span.hi()), ")")
-    } else {
-        span.lo()
+    let lo_after_visibility = match fn_sig.visibility {
+        ast::Visibility::Crate(s, CrateSugar::PubCrate) => {
+            context.codemap.span_after(mk_sp(s.hi(), span.hi()), ")")
+        }
+        ast::Visibility::Crate(s, CrateSugar::JustCrate) => s.hi(),
+        _ => span.lo(),
     };
     // A conservative estimation, to goal is to be over all parens in generics
     let args_start = fn_sig

src/items.rs

@@ -11,8 +11,8 @@
 use std::borrow::Cow;
 
 use syntax::{abi, ptr};
-use syntax::ast::{self, Attribute, MetaItem, MetaItemKind, NestedMetaItem, NestedMetaItemKind,
-                  Path, Visibility};
+use syntax::ast::{self, Attribute, CrateSugar, MetaItem, MetaItemKind, NestedMetaItem,
+                  NestedMetaItemKind, Path, Visibility};
 use syntax::codemap::{BytePos, Span, NO_EXPANSION};
 
 use rewrite::RewriteContext;
@@ -37,7 +37,8 @@ pub fn format_visibility(vis: &Visibility) -> Cow<'static, str> {
     match *vis {
         Visibility::Public => Cow::from("pub "),
         Visibility::Inherited => Cow::from(""),
-        Visibility::Crate(_) => Cow::from("pub(crate) "),
+        Visibility::Crate(_, CrateSugar::PubCrate) => Cow::from("pub(crate) "),
+        Visibility::Crate(_, CrateSugar::JustCrate) => Cow::from("crate "),
         Visibility::Restricted { ref path, .. } => {
             let Path { ref segments, .. } = **path;
             let mut segments_iter = segments.iter().map(|seg| seg.identifier.name.to_string());

src/utils.rs

@@ -62,3 +62,5 @@ mod foo {
 
 // #2082
 pub(crate) fn init() {}
+
+crate fn init() {}

tests/source/fn-simple.rs

@@ -24,6 +24,19 @@ pub(  crate  ) enum WriteState<D> {
     WriteData(Writer<D>),
 }
 
+  crate   enum WriteState<D> {
+    WriteId {
+        id: U64Writer,
+        size: U64Writer,
+        payload: Option<Writer<D>>,
+    },
+    WriteSize {
+        size: U64Writer,
+        payload: Option<Writer<D>>,
+    },
+    WriteData(Writer<D>),
+}
+
 pub(in  ::global::  path :: to::some_mod  ) enum WriteState<D> {
     WriteId {
         id: U64Writer,

tests/source/pub-restricted.rs

@@ -104,3 +104,5 @@ mod foo {
 
 // #2082
 pub(crate) fn init() {}
+
+crate fn init() {}

tests/target/fn-simple.rs

@@ -24,6 +24,19 @@ pub(crate) enum WriteState<D> {
     WriteData(Writer<D>),
 }
 
+crate enum WriteState<D> {
+    WriteId {
+        id: U64Writer,
+        size: U64Writer,
+        payload: Option<Writer<D>>,
+    },
+    WriteSize {
+        size: U64Writer,
+        payload: Option<Writer<D>>,
+    },
+    WriteData(Writer<D>),
+}
+
 pub(in global::path::to::some_mod) enum WriteState<D> {
     WriteId {
         id: U64Writer,