mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for collections reform

Browse Source
This commit is contained in:
Corey Richardson 2014-11-04 05:35:53 -05:00
parent 87a753e5ce
commit 61aeab4c9e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_back/target/mod.rs
View File

@ -217,7 +217,7 @@ impl Target {
let handler = diagnostic::default_handler(diagnostic::Auto, None);
let get_req_field = |name: &str| {
match obj.find(&name.to_string())
match obj.find(name)
.map(|s| s.as_string())
.and_then(|os| os.map(|s| s.to_string())) {
Some(val) => val,
@ -240,16 +240,16 @@ impl Target {
macro_rules! key (
($key_name:ident) => ( {
let name = (stringify!($key_name)).replace("_", "-");
obj.find(&name).map(|o| o.as_string()
obj.find(name[]).map(|o| o.as_string()
.map(|s| base.options.$key_name = s.to_string()));
} );
($key_name:ident, bool) => ( {
let name = (stringify!($key_name)).replace("_", "-");
obj.find(&name).map(|o| o.as_boolean().map(|s| base.options.$key_name = s));
obj.find(name[]).map(|o| o.as_boolean().map(|s| base.options.$key_name = s));
} );
($key_name:ident, list) => ( {
let name = (stringify!($key_name)).replace("_", "-");
obj.find(&name).map(|o| o.as_list()
obj.find(name[]).map(|o| o.as_list()
.map(|v| base.options.$key_name = v.iter()
.map(|a| a.as_string().unwrap().to_string()).collect()
)