urbit/ares
1
1
Fork 0
mirror of https://github.com/urbit/ares.git synced 2024-12-24 22:01:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

site: simplify, clippy

Browse Source
This commit is contained in:
Matthew LeVan 2024-06-14 14:32:33 -04:00
parent c80474d0cf
commit a7dca29031
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rust/ares/src/site.rs
View File

@ -19,7 +19,8 @@ impl Site {
pub fn new(ctx: &mut Context, core: &mut Noun) -> Site {
let mut battery = slot(*core, 2).unwrap();
let context = slot(*core, 7).unwrap();
if let Some((jet, path)) = ctx
let warm_result = ctx
.warm
.find_jet(&mut ctx.stack, core, &mut battery)
.filter(|(_jet, mut path)| {
@ -47,21 +48,13 @@ impl Site {
}
}
ret
})
{
return Site {
battery: battery,
context: context,
jet: Some(jet),
path: path,
};
});
Site {
battery,
context,
jet: warm_result.map(|(jet, _)| jet),
path: warm_result.map(|(_, path)| path).unwrap_or(D(0))
}
return Site {
battery: battery,
context: context,
jet: None,
path: D(0),
};
}
}
@ -70,8 +63,8 @@ pub fn site_slam(ctx: &mut Context, site: &Site, sample: Noun) -> Noun {
let subject = T(&mut ctx.stack, &[site.battery, sample, site.context]);
if site.jet.is_some() {
let jet = site.jet.unwrap();
return jet(ctx, subject).unwrap();
jet(ctx, subject).unwrap()
} else {
return interpret(ctx, subject, site.battery).unwrap();
interpret(ctx, subject, site.battery).unwrap()
}
}