Skip to content

Commit fd38acb

Browse files
kamalmarhubikamalmarhubi
committed
deps: Update syntex_syntax to 0.31.0
Most of the churn on this bump comes from the `Visibility` enum changing from pub enum Visibility { Public, Inherited, } to pub enum Visibility { Public, Crate, Restricted { path: P<Path>, id: NodeId }, Inherited, } which require taking `Visibility` by reference in most places. The new variants are not handled at this point. Refs rust-lang#970
1 parent 5092eec commit fd38acb

File tree

5 files changed

+51
-55
lines changed

5 files changed

+51
-55
lines changed

‎Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ regex = "0.1"
2121
term = "0.4"
2222
strings = "0.0.1"
2323
diff = "0.1"
24-
syntex_syntax = "0.30"
24+
syntex_syntax = "0.31"
2525
log = "0.3"
2626
env_logger = "0.3"
2727
getopts = "0.2"

‎src/items.rs

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl<'a> FmtVisitor<'a> {
126126
// These are not actually rust functions,
127127
// but we format them as such.
128128
abi::Abi::Rust,
129-
item.vis,
129+
&item.vis,
130130
span,
131131
false,
132132
false);
@@ -148,7 +148,7 @@ impl<'a> FmtVisitor<'a> {
148148
""
149149
};
150150
let prefix = format!("{}static {}{}: ",
151-
format_visibility(item.vis),
151+
format_visibility(&item.vis),
152152
mut_str,
153153
item.ident);
154154
let offset = self.block_indent + prefix.len();
@@ -179,7 +179,7 @@ impl<'a> FmtVisitor<'a> {
179179
unsafety: ast::Unsafety,
180180
constness: ast::Constness,
181181
abi: abi::Abi,
182-
vis: ast::Visibility,
182+
vis: &ast::Visibility,
183183
span: Span,
184184
block: &ast::Block)
185185
-> Option<String> {
@@ -244,7 +244,7 @@ impl<'a> FmtVisitor<'a> {
244244
sig.unsafety,
245245
sig.constness,
246246
sig.abi,
247-
ast::Visibility::Inherited,
247+
&ast::Visibility::Inherited,
248248
span,
249249
false,
250250
false));
@@ -303,7 +303,7 @@ impl<'a> FmtVisitor<'a> {
303303

304304
pub fn visit_enum(&mut self,
305305
ident: ast::Ident,
306-
vis: ast::Visibility,
306+
vis: &ast::Visibility,
307307
enum_def: &ast::EnumDef,
308308
generics: &ast::Generics,
309309
span: Span) {
@@ -414,7 +414,7 @@ impl<'a> FmtVisitor<'a> {
414414
format_struct(&context,
415415
"",
416416
field.node.name,
417-
ast::Visibility::Inherited,
417+
&ast::Visibility::Inherited,
418418
&field.node.data,
419419
None,
420420
field.span,
@@ -451,7 +451,7 @@ pub fn format_impl(context: &RewriteContext, item: &ast::Item, offset: Indent) -
451451
ref self_ty,
452452
ref items) = item.node {
453453
let mut result = String::new();
454-
result.push_str(format_visibility(item.vis));
454+
result.push_str(format_visibility(&item.vis));
455455
result.push_str(format_unsafety(unsafety));
456456
result.push_str("impl");
457457

@@ -583,7 +583,7 @@ fn is_impl_single_line(context: &RewriteContext,
583583
pub fn format_struct(context: &RewriteContext,
584584
item_name: &str,
585585
ident: ast::Ident,
586-
vis: ast::Visibility,
586+
vis: &ast::Visibility,
587587
struct_def: &ast::VariantData,
588588
generics: Option<&ast::Generics>,
589589
span: Span,
@@ -619,7 +619,7 @@ pub fn format_trait(context: &RewriteContext, item: &ast::Item, offset: Indent)
619619
item.node {
620620
let mut result = String::new();
621621
let header = format!("{}{}trait {}",
622-
format_visibility(item.vis),
622+
format_visibility(&item.vis),
623623
format_unsafety(unsafety),
624624
item.ident);
625625

@@ -741,7 +741,7 @@ pub fn format_trait(context: &RewriteContext, item: &ast::Item, offset: Indent)
741741
}
742742
}
743743

744-
fn format_unit_struct(item_name: &str, ident: ast::Ident, vis: ast::Visibility) -> Option<String> {
744+
fn format_unit_struct(item_name: &str, ident: ast::Ident, vis: &ast::Visibility) -> Option<String> {
745745
let mut result = String::with_capacity(1024);
746746

747747
let header_str = format_header(item_name, ident, vis);
@@ -754,7 +754,7 @@ fn format_unit_struct(item_name: &str, ident: ast::Ident, vis: ast::Visibility)
754754
fn format_struct_struct(context: &RewriteContext,
755755
item_name: &str,
756756
ident: ast::Ident,
757-
vis: ast::Visibility,
757+
vis: &ast::Visibility,
758758
fields: &[ast::StructField],
759759
generics: Option<&ast::Generics>,
760760
span: Span,
@@ -804,13 +804,13 @@ fn format_struct_struct(context: &RewriteContext,
804804
"}",
805805
|field| {
806806
// Include attributes and doc comments, if present
807-
if !field.node.attrs.is_empty() {
808-
field.node.attrs[0].span.lo
807+
if !field.attrs.is_empty() {
808+
field.attrs[0].span.lo
809809
} else {
810810
field.span.lo
811811
}
812812
},
813-
|field| field.node.ty.span.hi,
813+
|field| field.ty.span.hi,
814814
|field| field.rewrite(context, item_budget, item_indent),
815815
context.codemap.span_after(span, "{"),
816816
span.hi);
@@ -835,7 +835,7 @@ fn format_struct_struct(context: &RewriteContext,
835835
fn format_tuple_struct(context: &RewriteContext,
836836
item_name: &str,
837837
ident: ast::Ident,
838-
vis: ast::Visibility,
838+
vis: &ast::Visibility,
839839
fields: &[ast::StructField],
840840
generics: Option<&ast::Generics>,
841841
span: Span,
@@ -890,13 +890,13 @@ fn format_tuple_struct(context: &RewriteContext,
890890
")",
891891
|field| {
892892
// Include attributes and doc comments, if present
893-
if !field.node.attrs.is_empty() {
894-
field.node.attrs[0].span.lo
893+
if !field.attrs.is_empty() {
894+
field.attrs[0].span.lo
895895
} else {
896896
field.span.lo
897897
}
898898
},
899-
|field| field.node.ty.span.hi,
899+
|field| field.ty.span.hi,
900900
|field| field.rewrite(context, item_budget, item_indent),
901901
context.codemap.span_after(span, "("),
902902
span.hi);
@@ -924,12 +924,12 @@ pub fn rewrite_type_alias(context: &RewriteContext,
924924
ident: ast::Ident,
925925
ty: &ast::Ty,
926926
generics: &ast::Generics,
927-
vis: ast::Visibility,
927+
vis: &ast::Visibility,
928928
span: Span)
929929
-> Option<String> {
930930
let mut result = String::new();
931931

932-
result.push_str(&format_visibility(vis));
932+
result.push_str(&format_visibility(&vis));
933933
result.push_str("type ");
934934
result.push_str(&ident.to_string());
935935

@@ -991,21 +991,14 @@ pub fn rewrite_type_alias(context: &RewriteContext,
991991

992992
impl Rewrite for ast::StructField {
993993
fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Option<String> {
994-
if contains_skip(&self.node.attrs) {
995-
let span = context.snippet(mk_sp(self.node.attrs[0].span.lo, self.span.hi));
994+
if contains_skip(&self.attrs) {
995+
let span = context.snippet(mk_sp(self.attrs[0].span.lo, self.span.hi));
996996
return wrap_str(span, context.config.max_width, width, offset);
997997
}
998998

999-
let name = match self.node.kind {
1000-
ast::StructFieldKind::NamedField(ident, _) => Some(ident.to_string()),
1001-
ast::StructFieldKind::UnnamedField(_) => None,
1002-
};
1003-
let vis = match self.node.kind {
1004-
ast::StructFieldKind::NamedField(_, vis) |
1005-
ast::StructFieldKind::UnnamedField(vis) => format_visibility(vis),
1006-
};
1007-
let mut attr_str = try_opt!(self.node
1008-
.attrs
999+
let name = self.ident;
1000+
let vis = format_visibility(&self.vis);
1001+
let mut attr_str = try_opt!(self.attrs
10091002
.rewrite(context, context.config.max_width - offset.width(), offset));
10101003
if !attr_str.is_empty() {
10111004
attr_str.push('\n');
@@ -1019,13 +1012,13 @@ impl Rewrite for ast::StructField {
10191012

10201013
let last_line_width = last_line_width(&result);
10211014
let budget = try_opt!(width.checked_sub(last_line_width));
1022-
let rewrite = try_opt!(self.node.ty.rewrite(context, budget, offset + last_line_width));
1015+
let rewrite = try_opt!(self.ty.rewrite(context, budget, offset + last_line_width));
10231016
Some(result + &rewrite)
10241017
}
10251018
}
10261019

10271020
pub fn rewrite_static(prefix: &str,
1028-
vis: ast::Visibility,
1021+
vis: &ast::Visibility,
10291022
ident: ast::Ident,
10301023
ty: &ast::Ty,
10311024
mutability: ast::Mutability,
@@ -1239,7 +1232,7 @@ fn rewrite_fn_base(context: &RewriteContext,
12391232
unsafety: ast::Unsafety,
12401233
constness: ast::Constness,
12411234
abi: abi::Abi,
1242-
vis: ast::Visibility,
1235+
vis: &ast::Visibility,
12431236
span: Span,
12441237
newline_brace: bool,
12451238
has_body: bool)
@@ -1808,7 +1801,7 @@ fn rewrite_where_clause(context: &RewriteContext,
18081801
}
18091802
}
18101803

1811-
fn format_header(item_name: &str, ident: ast::Ident, vis: ast::Visibility) -> String {
1804+
fn format_header(item_name: &str, ident: ast::Ident, vis: &ast::Visibility) -> String {
18121805
format!("{}{}{}", format_visibility(vis), item_name, ident)
18131806
}
18141807

‎src/utils.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,13 @@ pub fn extra_offset(text: &str, offset: Indent) -> usize {
6767
}
6868

6969
#[inline]
70-
pub fn format_visibility(vis: Visibility) -> &'static str {
71-
match vis {
70+
pub fn format_visibility(vis: &Visibility) -> &'static str {
71+
match *vis {
7272
Visibility::Public => "pub ",
7373
Visibility::Inherited => "",
74+
// TODO(#970): Handle new visibility types.
75+
Visibility::Crate => unimplemented!(),
76+
Visibility::Restricted { .. } => unimplemented!(),
7477
}
7578
}
7679

‎src/visitor.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ impl<'a> FmtVisitor<'a> {
152152
sig.unsafety,
153153
sig.constness,
154154
sig.abi,
155-
vis.unwrap_or(ast::Visibility::Inherited),
155+
vis.unwrap_or(&ast::Visibility::Inherited),
156156
codemap::mk_sp(s.lo, b.span.lo),
157157
&b)
158158
}
@@ -198,7 +198,7 @@ impl<'a> FmtVisitor<'a> {
198198

199199
match item.node {
200200
ast::ItemKind::Use(ref vp) => {
201-
self.format_import(item.vis, vp, item.span);
201+
self.format_import(&item.vis, vp, item.span);
202202
}
203203
ast::ItemKind::Impl(..) => {
204204
self.format_missing_with_indent(item.span.lo);
@@ -229,7 +229,7 @@ impl<'a> FmtVisitor<'a> {
229229
::items::format_struct(&context,
230230
"struct ",
231231
item.ident,
232-
item.vis,
232+
&item.vis,
233233
def,
234234
Some(generics),
235235
item.span,
@@ -245,12 +245,12 @@ impl<'a> FmtVisitor<'a> {
245245
}
246246
ast::ItemKind::Enum(ref def, ref generics) => {
247247
self.format_missing_with_indent(item.span.lo);
248-
self.visit_enum(item.ident, item.vis, def, generics, item.span);
248+
self.visit_enum(item.ident, &item.vis, def, generics, item.span);
249249
self.last_pos = item.span.hi;
250250
}
251251
ast::ItemKind::Mod(ref module) => {
252252
self.format_missing_with_indent(item.span.lo);
253-
self.format_mod(module, item.vis, item.span, item.ident);
253+
self.format_mod(module, &item.vis, item.span, item.ident);
254254
}
255255
ast::ItemKind::Mac(ref mac) => {
256256
self.format_missing_with_indent(item.span.lo);
@@ -262,7 +262,7 @@ impl<'a> FmtVisitor<'a> {
262262
}
263263
ast::ItemKind::Static(ref ty, mutability, ref expr) => {
264264
let rewrite = rewrite_static("static",
265-
item.vis,
265+
&item.vis,
266266
item.ident,
267267
ty,
268268
mutability,
@@ -272,7 +272,7 @@ impl<'a> FmtVisitor<'a> {
272272
}
273273
ast::ItemKind::Const(ref ty, ref expr) => {
274274
let rewrite = rewrite_static("const",
275-
item.vis,
275+
&item.vis,
276276
item.ident,
277277
ty,
278278
ast::Mutability::Immutable,
@@ -289,7 +289,7 @@ impl<'a> FmtVisitor<'a> {
289289
unsafety,
290290
constness,
291291
abi,
292-
item.vis),
292+
&item.vis),
293293
decl,
294294
body,
295295
item.span,
@@ -301,7 +301,7 @@ impl<'a> FmtVisitor<'a> {
301301
item.ident,
302302
ty,
303303
generics,
304-
item.vis,
304+
&item.vis,
305305
item.span);
306306
self.push_rewrite(item.span, rewrite);
307307
}
@@ -316,7 +316,7 @@ impl<'a> FmtVisitor<'a> {
316316
match ti.node {
317317
ast::TraitItemKind::Const(ref ty, ref expr_opt) => {
318318
let rewrite = rewrite_static("const",
319-
ast::Visibility::Inherited,
319+
&ast::Visibility::Inherited,
320320
ti.ident,
321321
ty,
322322
ast::Mutability::Immutable,
@@ -354,15 +354,15 @@ impl<'a> FmtVisitor<'a> {
354354

355355
match ii.node {
356356
ast::ImplItemKind::Method(ref sig, ref body) => {
357-
self.visit_fn(visit::FnKind::Method(ii.ident, sig, Some(ii.vis)),
357+
self.visit_fn(visit::FnKind::Method(ii.ident, sig, Some(&ii.vis)),
358358
&sig.decl,
359359
body,
360360
ii.span,
361361
ii.id);
362362
}
363363
ast::ImplItemKind::Const(ref ty, ref expr) => {
364364
let rewrite = rewrite_static("const",
365-
ii.vis,
365+
&ii.vis,
366366
ii.ident,
367367
ty,
368368
ast::Mutability::Immutable,
@@ -462,7 +462,7 @@ impl<'a> FmtVisitor<'a> {
462462
}
463463
}
464464

465-
fn format_mod(&mut self, m: &ast::Mod, vis: ast::Visibility, s: Span, ident: ast::Ident) {
465+
fn format_mod(&mut self, m: &ast::Mod, vis: &ast::Visibility, s: Span, ident: ast::Ident) {
466466
// Decide whether this is an inline mod or an external mod.
467467
let local_file_name = self.codemap.span_to_filename(s);
468468
let is_internal = local_file_name == self.codemap.span_to_filename(m.inner);
@@ -501,7 +501,7 @@ impl<'a> FmtVisitor<'a> {
501501
self.format_missing(filemap.end_pos);
502502
}
503503

504-
fn format_import(&mut self, vis: ast::Visibility, vp: &ast::ViewPath, span: Span) {
504+
fn format_import(&mut self, vis: &ast::Visibility, vp: &ast::ViewPath, span: Span) {
505505
let vis = utils::format_visibility(vis);
506506
let mut offset = self.block_indent;
507507
offset.alignment += vis.len() + "use ".len();

0 commit comments

Comments
 (0)