Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Fix: #72 replace StructFieldKind #73

Merged
merged 1 commit into from
Apr 11, 2016
Merged

Fix: #72 replace StructFieldKind #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/struct_field.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use syntax::ast;
use syntax::codemap::{DUMMY_SP, Span, respan};
use syntax::codemap::{DUMMY_SP, Span};
use syntax::ptr::P;

use attr::AttrBuilder;
Expand All @@ -12,7 +12,8 @@ use ty::TyBuilder;
pub struct StructFieldBuilder<F=Identity> {
callback: F,
span: Span,
kind: ast::StructFieldKind,
ident: Option<ast::Ident>,
vis: ast::Visibility,
attrs: Vec<ast::Attribute>,
}

Expand All @@ -38,7 +39,8 @@ impl<F> StructFieldBuilder<F>
StructFieldBuilder {
callback: callback,
span: DUMMY_SP,
kind: ast::StructFieldKind::NamedField(id, ast::Visibility::Inherited),
ident: Some(id),
vis: ast::Visibility::Inherited,
attrs: vec![],
}
}
Expand All @@ -47,7 +49,8 @@ impl<F> StructFieldBuilder<F>
StructFieldBuilder {
callback: callback,
span: DUMMY_SP,
kind: ast::StructFieldKind::UnnamedField(ast::Visibility::Inherited),
ident: None,
vis: ast::Visibility::Inherited,
attrs: vec![],
}
}
Expand All @@ -58,12 +61,7 @@ impl<F> StructFieldBuilder<F>
}

pub fn pub_(mut self) -> Self {
match self.kind {
ast::StructFieldKind::NamedField(_, ref mut vis)
| ast::StructFieldKind::UnnamedField(ref mut vis) => {
*vis = ast::Visibility::Public;
}
}
self.vis = ast::Visibility::Public;
self
}

Expand All @@ -80,13 +78,15 @@ impl<F> StructFieldBuilder<F>
}

pub fn build_ty(self, ty: P<ast::Ty>) -> F::Result {
let field = ast::StructField_ {
kind: self.kind,
let field = ast::StructField {
id: ast::DUMMY_NODE_ID,
span: self.span,
ident: self.ident,
vis: self.vis,
ty: ty,
attrs: self.attrs,
};
self.callback.invoke(respan(self.span, field))
self.callback.invoke(field)
}

pub fn ty(self) -> TyBuilder<Self> {
Expand Down
111 changes: 51 additions & 60 deletions tests/test_struct_field.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,14 @@ fn test_named() {

assert_eq!(
builder.struct_field("x").ty().isize(),
respan(
DUMMY_SP,
ast::StructField_ {
kind: ast::NamedField(
builder.id("x"),
ast::Visibility::Inherited,
),
id: ast::DUMMY_NODE_ID,
ty: builder.ty().isize(),
attrs: vec![],
},
)
ast::StructField {
ident: Some(builder.id("x")),
vis: ast::Visibility::Inherited,
id: ast::DUMMY_NODE_ID,
ty: builder.ty().isize(),
attrs: vec![],
span: DUMMY_SP
}
);
}

Expand All @@ -31,15 +27,14 @@ fn test_unnamed() {

assert_eq!(
builder.tuple_field().ty().isize(),
respan(
DUMMY_SP,
ast::StructField_ {
kind: ast::UnnamedField(ast::Visibility::Inherited),
id: ast::DUMMY_NODE_ID,
ty: builder.ty().isize(),
attrs: vec![],
},
)
ast::StructField {
ident: None,
vis: ast::Visibility::Inherited,
id: ast::DUMMY_NODE_ID,
ty: builder.ty().isize(),
attrs: vec![],
span: DUMMY_SP
}
);
}

Expand All @@ -52,45 +47,41 @@ fn test_attrs() {
.attr().doc("/// doc string")
.attr().automatically_derived()
.ty().isize(),
respan(
DUMMY_SP,
ast::StructField_ {
kind: ast::NamedField(
builder.id("x"),
ast::Visibility::Inherited,
ast::StructField {
ident: Some(builder.id("x")),
vis: ast::Visibility::Inherited,
id: ast::DUMMY_NODE_ID,
ty: builder.ty().isize(),
span: DUMMY_SP,
attrs: vec![
respan(
DUMMY_SP,
ast::Attribute_ {
id: ast::AttrId(0),
style: ast::AttrStyle::Outer,
value: P(respan(
DUMMY_SP,
ast::MetaItemKind::NameValue(
builder.interned_string("doc"),
(*builder.lit().str("/// doc string")).clone(),
),
)),
is_sugared_doc: true,
}
),
respan(
DUMMY_SP,
ast::Attribute_ {
id: ast::AttrId(1),
style: ast::AttrStyle::Outer,
value: P(respan(
DUMMY_SP,
ast::MetaItemKind::Word(builder.interned_string("automatically_derived")),
)),
is_sugared_doc: false,
}
),
id: ast::DUMMY_NODE_ID,
ty: builder.ty().isize(),
attrs: vec![
respan(
DUMMY_SP,
ast::Attribute_ {
id: ast::AttrId(0),
style: ast::AttrStyle::Outer,
value: P(respan(
DUMMY_SP,
ast::MetaItemKind::NameValue(
builder.interned_string("doc"),
(*builder.lit().str("/// doc string")).clone(),
),
)),
is_sugared_doc: true,
}
),
respan(
DUMMY_SP,
ast::Attribute_ {
id: ast::AttrId(1),
style: ast::AttrStyle::Outer,
value: P(respan(
DUMMY_SP,
ast::MetaItemKind::Word(builder.interned_string("automatically_derived")),
)),
is_sugared_doc: false,
}
),
],
},
)
],
}
);
}