matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Remove id part from macro

Browse source
This commit is contained in:
Matthias Beyer 2016-08-30 10:52:00 +02:00
parent fea24726c8
commit ec2eb096e7
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libimagstore/src/storeid.rs
View file

@ -139,7 +139,6 @@ macro_rules! module_entry_path_mod {
unused_imports)] unused_imports)]
/// A helper module to create valid module entry paths /// A helper module to create valid module entry paths
pub mod module_path { pub mod module_path {
use semver::Version;
use std::convert::AsRef; use std::convert::AsRef;
use std::path::Path; use std::path::Path;
use std::path::PathBuf; use std::path::PathBuf;
@ -159,12 +158,9 @@ macro_rules! module_entry_path_mod {
let mut path = PathBuf::new(); let mut path = PathBuf::new();
path.push(format!("{}", $name)); path.push(format!("{}", $name));
path.push(pa.as_ref().clone()); path.push(pa.as_ref().clone());
let version = Version::parse($version).unwrap();
let name = pa.as_ref().file_name().unwrap() let name = pa.as_ref().file_name().unwrap()
.to_str().unwrap(); .to_str().unwrap();
path.set_file_name(format!("{}~{}", path.set_file_name(name);
name,
version));
ModuleEntryPath(path) ModuleEntryPath(path)
} }
} }
@ -220,7 +216,7 @@ mod test {
fn correct_path() { fn correct_path() {
let p = module_path::ModuleEntryPath::new("test"); let p = module_path::ModuleEntryPath::new("test");
assert_eq!(p.into_storeid().unwrap().to_str().unwrap(), "test/test~0.2.0-alpha+leet1337"); assert_eq!(p.into_storeid().unwrap().to_str().unwrap(), "test/test");
} }
} }