Merge pull request #102 from eth-p/master

Added text wrapping. (Fixes #54)
This commit is contained in:
David Peter authored and GitHub committed 2018-05-16 08:41:49 +02:00
commit 2eee68599d
12 files changed
+497 -247

No files matched your search

@@ -1,25 +1,25 @@
───────┬────────────────────────────────────────────────────────────────────────
│ File: sample.rs
───────┼────────────────────────────────────────────────────────────────────────
│ struct Rectangle {
│ width: u32,
│ height: u32,
│ }
│
_ │ fn main() {
│ let rect1 = Rectangle { width: 30, height: 50 };
│
│ println!(
~ │ "The perimeter of the rectangle is {} pixels.",
~ │ perimeter(&rect1)
│ );
│ }
│
│ fn area(rectangle: &Rectangle) -> u32 {
│ rectangle.width * rectangle.height
│ }
+ │
+ │ fn perimeter(rectangle: &Rectangle) -> u32 {
+ │ (rectangle.width + rectangle.height) * 2
+ │ }
───────┴────────────────────────────────────────────────────────────────────────
──┬─────────────────────────────────────────────────────────────────────────────
│ File: sample.rs
──┼─────────────────────────────────────────────────────────────────────────────
│ struct Rectangle {
│ width: u32,
│ height: u32,
│ }
│
_ │ fn main() {
│ let rect1 = Rectangle { width: 30, height: 50 };
│
│ println!(
~ │ "The perimeter of the rectangle is {} pixels.",
~ │ perimeter(&rect1)
│ );
│ }
│
│ fn area(rectangle: &Rectangle) -> u32 {
│ rectangle.width * rectangle.height
│ }
+ │
+ │ fn perimeter(rectangle: &Rectangle) -> u32 {
+ │ (rectangle.width + rectangle.height) * 2
+ │ }
──┴─────────────────────────────────────────────────────────────────────────────
@@ -1,22 +1,22 @@
│ struct Rectangle {
│ width: u32,
│ height: u32,
│ }
│
_ │ fn main() {
│ let rect1 = Rectangle { width: 30, height: 50 };
│
│ println!(
~ │ "The perimeter of the rectangle is {} pixels.",
~ │ perimeter(&rect1)
│ );
│ }
│
│ fn area(rectangle: &Rectangle) -> u32 {
│ rectangle.width * rectangle.height
│ }
+ │
+ │ fn perimeter(rectangle: &Rectangle) -> u32 {
+ │ (rectangle.width + rectangle.height) * 2
+ │ }
───────┴────────────────────────────────────────────────────────────────────────
│ struct Rectangle {
│ width: u32,
│ height: u32,
│ }
│
_ │ fn main() {
│ let rect1 = Rectangle { width: 30, height: 50 };
│
│ println!(
~ │ "The perimeter of the rectangle is {} pixels.",
~ │ perimeter(&rect1)
│ );
│ }
│
│ fn area(rectangle: &Rectangle) -> u32 {
│ rectangle.width * rectangle.height
│ }
+ │
+ │ fn perimeter(rectangle: &Rectangle) -> u32 {
+ │ (rectangle.width + rectangle.height) * 2
+ │ }
──┴─────────────────────────────────────────────────────────────────────────────
@@ -1,25 +1,25 @@
───────┬────────────────────────────────────────────────────────────────────────
│ File: sample.rs
───────┼────────────────────────────────────────────────────────────────────────
1 │ struct Rectangle {
2 │ width: u32,
3 │ height: u32,
4 │ }
5 │
6 │ fn main() {
7 │ let rect1 = Rectangle { width: 30, height: 50 };
8 │
9 │ println!(
10 │ "The perimeter of the rectangle is {} pixels.",
11 │ perimeter(&rect1)
12 │ );
13 │ }
14 │
15 │ fn area(rectangle: &Rectangle) -> u32 {
16 │ rectangle.width * rectangle.height
17 │ }
18 │
19 │ fn perimeter(rectangle: &Rectangle) -> u32 {
20 │ (rectangle.width + rectangle.height) * 2
21 │ }
───────┴────────────────────────────────────────────────────────────────────────
─────┬──────────────────────────────────────────────────────────────────────────
│ File: sample.rs
─────┼──────────────────────────────────────────────────────────────────────────
1 │ struct Rectangle {
2 │ width: u32,
3 │ height: u32,
4 │ }
5 │
6 │ fn main() {
7 │ let rect1 = Rectangle { width: 30, height: 50 };
8 │
9 │ println!(
10 │ "The perimeter of the rectangle is {} pixels.",
11 │ perimeter(&rect1)
12 │ );
13 │ }
14 │
15 │ fn area(rectangle: &Rectangle) -> u32 {
16 │ rectangle.width * rectangle.height
17 │ }
18 │
19 │ fn perimeter(rectangle: &Rectangle) -> u32 {
20 │ (rectangle.width + rectangle.height) * 2
21 │ }
─────┴──────────────────────────────────────────────────────────────────────────
+25 -25
View File
@@ -1,25 +1,25 @@
───────┬────────────────────────────────────────────────────────────────────────
│ File: sample.rs
───────┼────────────────────────────────────────────────────────────────────────
│ struct Rectangle {
│ width: u32,
│ height: u32,
│ }
│
│ fn main() {
│ let rect1 = Rectangle { width: 30, height: 50 };
│
│ println!(
│ "The perimeter of the rectangle is {} pixels.",
│ perimeter(&rect1)
│ );
│ }
│
│ fn area(rectangle: &Rectangle) -> u32 {
│ rectangle.width * rectangle.height
│ }
│
│ fn perimeter(rectangle: &Rectangle) -> u32 {
│ (rectangle.width + rectangle.height) * 2
│ }
───────┴────────────────────────────────────────────────────────────────────────
────────────────────────────────────────────────────────────────────────────────
File: sample.rs
────────────────────────────────────────────────────────────────────────────────
struct Rectangle {
width: u32,
height: u32,
}
fn main() {
let rect1 = Rectangle { width: 30, height: 50 };
println!(
"The perimeter of the rectangle is {} pixels.",
perimeter(&rect1)
);
}
fn area(rectangle: &Rectangle) -> u32 {
rectangle.width * rectangle.height
}
fn perimeter(rectangle: &Rectangle) -> u32 {
(rectangle.width + rectangle.height) * 2
}
────────────────────────────────────────────────────────────────────────────────
@@ -1,22 +1,22 @@
1 │ struct Rectangle {
2 │ width: u32,
3 │ height: u32,
4 │ }
5 │
6 │ fn main() {
7 │ let rect1 = Rectangle { width: 30, height: 50 };
8 │
9 │ println!(
10 │ "The perimeter of the rectangle is {} pixels.",
11 │ perimeter(&rect1)
12 │ );
13 │ }
14 │
15 │ fn area(rectangle: &Rectangle) -> u32 {
16 │ rectangle.width * rectangle.height
17 │ }
18 │
19 │ fn perimeter(rectangle: &Rectangle) -> u32 {
20 │ (rectangle.width + rectangle.height) * 2
21 │ }
───────┴────────────────────────────────────────────────────────────────────────
1 │ struct Rectangle {
2 │ width: u32,
3 │ height: u32,
4 │ }
5 │
6 │ fn main() {
7 │ let rect1 = Rectangle { width: 30, height: 50 };
8 │
9 │ println!(
10 │ "The perimeter of the rectangle is {} pixels.",
11 │ perimeter(&rect1)
12 │ );
13 │ }
14 │
15 │ fn area(rectangle: &Rectangle) -> u32 {
16 │ rectangle.width * rectangle.height
17 │ }
18 │
19 │ fn perimeter(rectangle: &Rectangle) -> u32 {
20 │ (rectangle.width + rectangle.height) * 2
21 │ }
─────┴──────────────────────────────────────────────────────────────────────────
+22 -22
View File
@@ -1,22 +1,22 @@
│ struct Rectangle {
│ width: u32,
│ height: u32,
│ }
│
│ fn main() {
│ let rect1 = Rectangle { width: 30, height: 50 };
│
│ println!(
│ "The perimeter of the rectangle is {} pixels.",
│ perimeter(&rect1)
│ );
│ }
│
│ fn area(rectangle: &Rectangle) -> u32 {
│ rectangle.width * rectangle.height
│ }
│
│ fn perimeter(rectangle: &Rectangle) -> u32 {
│ (rectangle.width + rectangle.height) * 2
│ }
───────┴────────────────────────────────────────────────────────────────────────
struct Rectangle {
width: u32,
height: u32,
}
fn main() {
let rect1 = Rectangle { width: 30, height: 50 };
println!(
"The perimeter of the rectangle is {} pixels.",
perimeter(&rect1)
);
}
fn area(rectangle: &Rectangle) -> u32 {
rectangle.width * rectangle.height
}
fn perimeter(rectangle: &Rectangle) -> u32 {
(rectangle.width + rectangle.height) * 2
}
────────────────────────────────────────────────────────────────────────────────