Skip to content

Commit 708cfef

Browse files
committed
enums3: Avoid confusion with parentheses
1 parent 01b8432 commit 708cfef

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

exercises/08_enums/enums3.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ struct State {
1212
height: u64,
1313
position: Point,
1414
message: String,
15+
// RGB color composed of red, green and blue.
1516
color: (u8, u8, u8),
1617
quit: bool,
1718
}
@@ -30,18 +31,17 @@ impl State {
3031
self.message = s;
3132
}
3233

33-
fn change_color(&mut self, color: (u8, u8, u8)) {
34-
self.color = color;
34+
fn change_color(&mut self, red: u8, green: u8, blue: u8) {
35+
self.color = (red, green, blue);
3536
}
3637

3738
fn quit(&mut self) {
3839
self.quit = true;
3940
}
4041

4142
fn process(&mut self, message: Message) {
42-
// TODO: Create a match expression to process the different message variants.
43-
// Remember: When passing a tuple as a function argument, you'll need extra parentheses:
44-
// e.g. `foo((t, u, p, l, e))`
43+
// TODO: Create a match expression to process the different message
44+
// variants using the methods defined above.
4545
}
4646
}
4747

solutions/08_enums/enums3.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ impl State {
3434
self.message = s;
3535
}
3636

37-
fn change_color(&mut self, color: (u8, u8, u8)) {
38-
self.color = color;
37+
fn change_color(&mut self, red: u8, green: u8, blue: u8) {
38+
self.color = (red, green, blue);
3939
}
4040

4141
fn quit(&mut self) {
@@ -47,7 +47,7 @@ impl State {
4747
Message::Resize { width, height } => self.resize(width, height),
4848
Message::Move(point) => self.move_position(point),
4949
Message::Echo(s) => self.echo(s),
50-
Message::ChangeColor(r, g, b) => self.change_color((r, g, b)),
50+
Message::ChangeColor(r, g, b) => self.change_color(r, g, b),
5151
Message::Quit => self.quit(),
5252
}
5353
}

0 commit comments

Comments
 (0)