squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Refactor Shape

Browse source
This commit is contained in:
topecongiro 2017-04-19 18:52:56 +09:00
parent af3f4c7f29
commit 883db2f952
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/lib.rs
View file

@ -262,10 +262,7 @@ impl Shape {
let alignment = self.offset + extra_width; let alignment = self.offset + extra_width;
Shape { Shape {
width: self.width, width: self.width,
indent: Indent { indent: Indent::new(self.indent.block_indent, alignment),
block_indent: self.indent.block_indent,
alignment: alignment,
},
offset: alignment, offset: alignment,
} }
} }
@ -274,19 +271,13 @@ impl Shape {
if self.indent.alignment == 0 { if self.indent.alignment == 0 {
Shape { Shape {
width: self.width, width: self.width,
indent: Indent { indent: Indent::new(self.indent.block_indent + extra_width, 0),
block_indent: self.indent.block_indent + extra_width,
alignment: 0,
},
offset: 0, offset: 0,
} }
} else { } else {
Shape { Shape {
width: self.width, width: self.width,
indent: Indent { indent: self.indent + extra_width,
block_indent: self.indent.block_indent,
alignment: self.indent.alignment + extra_width,
},
offset: self.indent.alignment + extra_width, offset: self.indent.alignment + extra_width,
} }
} }
@ -295,10 +286,7 @@ impl Shape {
pub fn add_offset(&self, extra_width: usize) -> Shape { pub fn add_offset(&self, extra_width: usize) -> Shape {
Shape { Shape {
width: self.width, width: self.width,
indent: Indent { indent: self.indent,
block_indent: self.indent.block_indent,
alignment: self.indent.alignment,
},
offset: self.offset + extra_width, offset: self.offset + extra_width,
} }
} }
@ -306,10 +294,7 @@ impl Shape {
pub fn block(&self) -> Shape { pub fn block(&self) -> Shape {
Shape { Shape {
width: self.width, width: self.width,
indent: Indent { indent: self.indent.block_only(),
block_indent: self.indent.block_indent,
alignment: 0,
},
offset: self.offset, offset: self.offset,
} }
} }