Skip to content

Commit 118cb8e

Browse files
authored
Merge pull request #20 from xadrianzetx/fix-delete-types
Pass `name` as string slice to `delete_game_by_name`
2 parents 0ed1e76 + 28c3026 commit 118cb8e

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/commands/delete.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::path::Path;
55

66
use clap::ArgMatches;
77

8-
fn delete_game_by_name(path: &Path, name: String) -> Result<()> {
8+
fn delete_game_by_name(path: &Path, name: &str) -> Result<()> {
99
let ulpath = path.join(Path::new("ul.cfg"));
1010
let mut ulcfg = Ulcfg::load(&ulpath)?;
1111
ulcfg.delete_game_by_name(name)?;
@@ -34,8 +34,7 @@ pub fn delete(args: &ArgMatches) {
3434
}
3535

3636
if let Some(name) = args.value_of("name") {
37-
let namestr = String::from(name);
38-
match delete_game_by_name(path, namestr) {
37+
match delete_game_by_name(path, name) {
3938
Ok(()) => (),
4039
Err(_) => println!("Could not delete game by name"),
4140
}

src/ul/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ impl Ulcfg {
128128
Ok(())
129129
}
130130

131-
pub fn delete_game_by_name(&mut self, name: String) -> Result<()> {
131+
pub fn delete_game_by_name(&mut self, name: &str) -> Result<()> {
132132
for (index, game) in self.games.iter().enumerate() {
133-
if game.opl_name == name.as_str() {
133+
if game.opl_name == name {
134134
self.delete_game(index)?;
135135
return Ok(());
136136
}

0 commit comments

Comments
 (0)