max/bitsy-parser
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Format Rust code using rustfmt

Browse Source
This commit is contained in:
github-actions[bot]
2020-04-18 15:58:30 +00:00
committed by GitHub
parent 9a5c4df2b1
commit cba6c16414
18 changed files with 956 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/exit.rs
View File

@@ -1,4 +1,4 @@
use crate::{Position, from_base36, ToBase36};
use crate::{from_base36, Position, ToBase36};
#[derive(Debug, Eq, PartialEq)]
pub enum Transition {
@@ -16,15 +16,15 @@ pub enum Transition {
impl From<&str> for Transition {
fn from(str: &str) -> Transition {
match str {
"fade_w" => Transition::FadeToWhite,
"fade_b" => Transition::FadeToBlack,
"wave" => Transition::Wave,
"tunnel" => Transition::Tunnel,
"fade_w" => Transition::FadeToWhite,
"fade_b" => Transition::FadeToBlack,
"wave" => Transition::Wave,
"tunnel" => Transition::Tunnel,
"slide_u" => Transition::SlideUp,
"slide_d" => Transition::SlideDown,
"slide_l" => Transition::SlideLeft,
"slide_r" => Transition::SlideRight,
_ => Transition::None,
_ => Transition::None,
}
}
}
@@ -34,21 +34,23 @@ impl ToString for Transition {
match &self {
Transition::FadeToWhite => " FX fade_w",
Transition::FadeToBlack => " FX fade_b",
Transition::Wave => " FX wave",
Transition::Tunnel => " FX tunnel",
Transition::SlideUp => " FX slide_u",
Transition::SlideDown => " FX slide_d",
Transition::SlideLeft => " FX slide_l",
Transition::SlideRight => " FX slide_r",
Transition::None => "",
}.to_string()
Transition::Wave => " FX wave",
Transition::Tunnel => " FX tunnel",
Transition::SlideUp => " FX slide_u",
Transition::SlideDown => " FX slide_d",
Transition::SlideLeft => " FX slide_l",
Transition::SlideRight => " FX slide_r",
Transition::None => "",
}
.to_string()
}
}
#[derive(Debug, Eq, PartialEq)]
pub struct Exit {
/// destination
pub room_id: u64, /// id
pub room_id: u64,
/// id
pub position: Position,
pub effect: Transition,
}
@@ -66,7 +68,11 @@ impl From<String> for Exit {
Transition::None
};
Exit { room_id, position, effect }
Exit {
room_id,
position,
effect,
}
}
}
@@ -85,7 +91,11 @@ impl ToString for Exit {
fn test_exit_from_string() {
assert_eq!(
Exit::from("a 12,13".to_string()),
Exit { room_id: 10, position: Position { x: 12, y: 13 }, effect: Transition::None }
Exit {
room_id: 10,
position: Position { x: 12, y: 13 },
effect: Transition::None
}
);
}
@@ -93,14 +103,23 @@ fn test_exit_from_string() {
fn test_exit_from_string_with_fx() {
assert_eq!(
Exit::from("a 12,13 FX slide_u".to_string()),
Exit { room_id: 10, position: Position { x: 12, y: 13 }, effect: Transition::SlideUp }
Exit {
room_id: 10,
position: Position { x: 12, y: 13 },
effect: Transition::SlideUp
}
);
}
#[test]
fn test_exit_to_string() {
assert_eq!(
Exit { room_id: 8, position: Position { x: 5, y: 6 }, effect: Transition::None}.to_string(),
Exit {
room_id: 8,
position: Position { x: 5, y: 6 },
effect: Transition::None
}
.to_string(),
"8 5,6".to_string()
);
}
@@ -112,7 +131,8 @@ fn test_exit_to_string_with_fx() {
room_id: 8,
position: Position { x: 5, y: 6 },
effect: Transition::FadeToWhite
}.to_string(),
}
.to_string(),
"8 5,6 FX fade_w".to_string()
);
}