Skip to content

Commit 0d27f70

Browse files
committed
Remove feature: crate visibility modifier
1 parent 241a6f6 commit 0d27f70

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

Diff for: src/items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1361,7 +1361,7 @@ pub(crate) fn format_struct_struct(
13611361

13621362
fn get_bytepos_after_visibility(vis: &ast::Visibility, default_span: Span) -> BytePos {
13631363
match vis.kind {
1364-
ast::VisibilityKind::Crate(..) | ast::VisibilityKind::Restricted { .. } => vis.span.hi(),
1364+
ast::VisibilityKind::Crate | ast::VisibilityKind::Restricted { .. } => vis.span.hi(),
13651365
_ => default_span.lo(),
13661366
}
13671367
}

Diff for: src/utils.rs

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::borrow::Cow;
22

33
use rustc_ast::ast::{
4-
self, Attribute, CrateSugar, MetaItem, MetaItemKind, NestedMetaItem, NodeId, Path, Visibility,
4+
self, Attribute, MetaItem, MetaItemKind, NestedMetaItem, NodeId, Path, Visibility,
55
VisibilityKind,
66
};
77
use rustc_ast::ptr;
@@ -46,12 +46,8 @@ pub(crate) fn is_same_visibility(a: &Visibility, b: &Visibility) -> bool {
4646
(VisibilityKind::Public, VisibilityKind::Public)
4747
| (VisibilityKind::Inherited, VisibilityKind::Inherited)
4848
| (
49-
VisibilityKind::Crate(CrateSugar::PubCrate),
50-
VisibilityKind::Crate(CrateSugar::PubCrate),
51-
)
52-
| (
53-
VisibilityKind::Crate(CrateSugar::JustCrate),
54-
VisibilityKind::Crate(CrateSugar::JustCrate),
49+
VisibilityKind::Crate,
50+
VisibilityKind::Crate,
5551
) => true,
5652
_ => false,
5753
}
@@ -65,8 +61,7 @@ pub(crate) fn format_visibility(
6561
match vis.kind {
6662
VisibilityKind::Public => Cow::from("pub "),
6763
VisibilityKind::Inherited => Cow::from(""),
68-
VisibilityKind::Crate(CrateSugar::PubCrate) => Cow::from("pub(crate) "),
69-
VisibilityKind::Crate(CrateSugar::JustCrate) => Cow::from("crate "),
64+
VisibilityKind::Crate => Cow::from("pub(crate) "),
7065
VisibilityKind::Restricted { ref path, .. } => {
7166
let Path { ref segments, .. } = **path;
7267
let mut segments_iter = segments.iter().map(|seg| rewrite_ident(context, seg.ident));

0 commit comments

Comments
 (0)