greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Packages Projects Releases 9 Wiki Activity

Add Into<String> to symbol::* constructors. Fixes #199

Browse source
This commit is contained in:
Jordan Santell 2017-01-28 22:51:46 -08:00
parent c6fa14c0c8
commit 18279fdd3c
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
edn/src/symbols.rs
View file

@ -80,16 +80,19 @@ impl PlainSymbol {
} }
impl NamespacedSymbol { impl NamespacedSymbol {
pub fn new(namespace: &str, name: &str) -> Self { pub fn new<T>(namespace: T, name: T) -> Self where T: Into<String> {
assert!(!name.is_empty(), "Symbols cannot be unnamed."); let n = name.into();
assert!(!namespace.is_empty(), "Symbols cannot have an empty non-null namespace."); let ns = namespace.into();
NamespacedSymbol { name: name.to_string(), namespace: namespace.to_string() } assert!(!n.is_empty(), "Symbols cannot be unnamed.");
assert!(!ns.is_empty(), "Symbols cannot have an empty non-null namespace.");
NamespacedSymbol { name: n, namespace: ns }
} }
} }
impl Keyword { impl Keyword {
pub fn new<T>(name: T) -> Self where T: Into<String>{ pub fn new<T>(name: T) -> Self where T: Into<String> {
let n = name.into(); let n = name.into();
assert!(!n.is_empty(), "Keywords cannot be unnamed."); assert!(!n.is_empty(), "Keywords cannot be unnamed.");
@ -98,12 +101,14 @@ impl Keyword {
} }
impl NamespacedKeyword { impl NamespacedKeyword {
pub fn new(namespace: &str, name: &str) -> Self { pub fn new<T>(namespace: T, name: T) -> Self where T: Into<String> {
assert!(!name.is_empty(), "Keywords cannot be unnamed."); let n = name.into();
assert!(!namespace.is_empty(), "Keywords cannot have an empty non-null namespace."); let ns = namespace.into();
assert!(!n.is_empty(), "Keywords cannot be unnamed.");
assert!(!ns.is_empty(), "Keywords cannot have an empty non-null namespace.");
// TODO: debug asserts to ensure that neither field matches [ :/]. // TODO: debug asserts to ensure that neither field matches [ :/].
NamespacedKeyword { name: name.to_string(), namespace: namespace.to_string() } NamespacedKeyword { name: n, namespace: ns }
} }
} }