Format Rust code using rustfmt
This commit is contained in:
committed by
GitHub
parent
9a5c4df2b1
commit
cba6c16414
63
src/room.rs
63
src/room.rs
@@ -1,4 +1,4 @@
|
||||
use crate::{Exit, ExitInstance, Instance, Position, from_base36, ToBase36, optional_data_line};
|
||||
use crate::{from_base36, optional_data_line, Exit, ExitInstance, Instance, Position, ToBase36};
|
||||
|
||||
#[derive(Debug, Eq, PartialEq)]
|
||||
pub struct Room {
|
||||
@@ -66,7 +66,10 @@ impl From<String> for Room {
|
||||
let position = item_position[1];
|
||||
let position = Position::from(position.to_string()).unwrap();
|
||||
|
||||
items.push(Instance { position, id: item_id.to_string() });
|
||||
items.push(Instance {
|
||||
position,
|
||||
id: item_id.to_string(),
|
||||
});
|
||||
} else if last_line.starts_with("EXT") {
|
||||
let last_line = last_line.replace("EXT ", "");
|
||||
let parts: Vec<&str> = last_line.split(' ').collect();
|
||||
@@ -81,7 +84,10 @@ impl From<String> for Room {
|
||||
let position = ending_position[1].to_string();
|
||||
let position = Position::from(position).unwrap();
|
||||
|
||||
endings.push(Instance { position, id: ending });
|
||||
endings.push(Instance {
|
||||
position,
|
||||
id: ending,
|
||||
});
|
||||
} else {
|
||||
lines.push(last_line);
|
||||
break;
|
||||
@@ -95,7 +101,8 @@ impl From<String> for Room {
|
||||
for line in lines.into_iter() {
|
||||
let line: Vec<&str> = if line.contains(",") {
|
||||
line.split(",").collect()
|
||||
} else { // old room format
|
||||
} else {
|
||||
// old room format
|
||||
line.split("").collect()
|
||||
};
|
||||
|
||||
@@ -108,7 +115,16 @@ impl From<String> for Room {
|
||||
exits.reverse();
|
||||
endings.reverse();
|
||||
|
||||
Room { id, palette_id, name, tiles, items, exits, endings, walls }
|
||||
Room {
|
||||
id,
|
||||
palette_id,
|
||||
name,
|
||||
tiles,
|
||||
items,
|
||||
exits,
|
||||
endings,
|
||||
walls,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -138,25 +154,27 @@ impl ToString for Room {
|
||||
tiles.pop(); // remove trailing newline
|
||||
|
||||
for instance in &self.items {
|
||||
items.push_str(
|
||||
&format!("\nITM {} {}", instance.id, instance.position.to_string())
|
||||
);
|
||||
items.push_str(&format!(
|
||||
"\nITM {} {}",
|
||||
instance.id,
|
||||
instance.position.to_string()
|
||||
));
|
||||
}
|
||||
|
||||
for instance in &self.exits {
|
||||
exits.push_str(
|
||||
&format!(
|
||||
"\nEXT {} {}",
|
||||
instance.position.to_string(),
|
||||
instance.exit.to_string(),
|
||||
)
|
||||
);
|
||||
exits.push_str(&format!(
|
||||
"\nEXT {} {}",
|
||||
instance.position.to_string(),
|
||||
instance.exit.to_string(),
|
||||
));
|
||||
}
|
||||
|
||||
for instance in &self.endings {
|
||||
endings.push_str(
|
||||
&format!("\nEND {} {}", instance.id, instance.position.to_string())
|
||||
);
|
||||
endings.push_str(&format!(
|
||||
"\nEND {} {}",
|
||||
instance.id,
|
||||
instance.position.to_string()
|
||||
));
|
||||
}
|
||||
|
||||
format!(
|
||||
@@ -175,14 +193,15 @@ impl ToString for Room {
|
||||
|
||||
#[test]
|
||||
fn test_room_to_string() {
|
||||
assert_eq!(crate::mock::room().to_string(), include_str!("test-resources/room").to_string());
|
||||
assert_eq!(
|
||||
crate::mock::room().to_string(),
|
||||
include_str!("test-resources/room").to_string()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_room_walls_array() {
|
||||
let output = Room::from(
|
||||
include_str!("test-resources/room-with-walls").to_string()
|
||||
);
|
||||
let output = Room::from(include_str!("test-resources/room-with-walls").to_string());
|
||||
|
||||
assert_eq!(output.walls, vec![10, 15]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user