mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove feature: crate visibility modifier

Browse Source
This commit is contained in:
Jacob Pratt 2022-05-21 13:53:26 -04:00
parent 241a6f6930
commit 0d27f70743
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/items.rs
View File

@ -1361,7 +1361,7 @@ pub(crate) fn format_struct_struct(
fn get_bytepos_after_visibility(vis: &ast::Visibility, default_span: Span) -> BytePos { fn get_bytepos_after_visibility(vis: &ast::Visibility, default_span: Span) -> BytePos {
match vis.kind { match vis.kind {
ast::VisibilityKind::Crate(..) | ast::VisibilityKind::Restricted { .. } => vis.span.hi(), ast::VisibilityKind::Crate | ast::VisibilityKind::Restricted { .. } => vis.span.hi(),
_ => default_span.lo(), _ => default_span.lo(),
} }
} }

13
src/utils.rs
View File

@ -1,7 +1,7 @@
use std::borrow::Cow; use std::borrow::Cow;
use rustc_ast::ast::{ use rustc_ast::ast::{
self, Attribute, CrateSugar, MetaItem, MetaItemKind, NestedMetaItem, NodeId, Path, Visibility, self, Attribute, MetaItem, MetaItemKind, NestedMetaItem, NodeId, Path, Visibility,
VisibilityKind, VisibilityKind,
}; };
use rustc_ast::ptr; use rustc_ast::ptr;
@ -46,12 +46,8 @@ pub(crate) fn is_same_visibility(a: &Visibility, b: &Visibility) -> bool {
(VisibilityKind::Public, VisibilityKind::Public) (VisibilityKind::Public, VisibilityKind::Public)
| (VisibilityKind::Inherited, VisibilityKind::Inherited) | (VisibilityKind::Inherited, VisibilityKind::Inherited)
| ( | (
VisibilityKind::Crate(CrateSugar::PubCrate), VisibilityKind::Crate,
VisibilityKind::Crate(CrateSugar::PubCrate), VisibilityKind::Crate,
)
| (
VisibilityKind::Crate(CrateSugar::JustCrate),
VisibilityKind::Crate(CrateSugar::JustCrate),
) => true, ) => true,
_ => false, _ => false,
} }
@ -65,8 +61,7 @@ pub(crate) fn format_visibility(
match vis.kind { match vis.kind {
VisibilityKind::Public => Cow::from("pub "), VisibilityKind::Public => Cow::from("pub "),
VisibilityKind::Inherited => Cow::from(""), VisibilityKind::Inherited => Cow::from(""),
VisibilityKind::Crate(CrateSugar::PubCrate) => Cow::from("pub(crate) "), VisibilityKind::Crate => Cow::from("pub(crate) "),
VisibilityKind::Crate(CrateSugar::JustCrate) => Cow::from("crate "),
VisibilityKind::Restricted { ref path, .. } => { VisibilityKind::Restricted { ref path, .. } => {
let Path { ref segments, .. } = **path; let Path { ref segments, .. } = **path;
let mut segments_iter = segments.iter().map(|seg| rewrite_ident(context, seg.ident)); let mut segments_iter = segments.iter().map(|seg| rewrite_ident(context, seg.ident));