talexander/duster
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Create from_borrowed and from_owned constructors for IceResult and BreadcrumbTreeElement.

Browse Source 
In an effort to keep track of how often memory is getting heap allocated, I am implementing constructors for IceResult and BreadcrumbTreeElement. This should limit the places that I call Rc::new and allow me to place tracing code into it later to ensure all code paths doing heap allocation make sense.
This commit is contained in:
Tom Alexander
2020-06-06 20:24:01 -04:00
parent 3c15e35b67
commit 02259b9bd6
4 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderer/parameters_context.rs
View File

@@ -45,14 +45,14 @@ impl<'a> ParametersContext<'a> {
let k = kvpair.key;
let v: Option<BreadcrumbTreeElement<'a>> = match &kvpair.value {
RValue::RVLiteral(owned_literal) => {
Some(BreadcrumbTreeElement::Borrowed(&kvpair.value))
Some(BreadcrumbTreeElement::from_borrowed(&kvpair.value))
}
RValue::RVPath(path) => kvpair
.value
.into_context_element(renderer, breadcrumbs)
.map(std::convert::From::from),
RValue::RVTemplate(template) => {
Some(BreadcrumbTreeElement::Borrowed(&kvpair.value))
Some(BreadcrumbTreeElement::from_borrowed(&kvpair.value))
}
};
v.map(|some_v| (k, some_v))
@@ -73,7 +73,7 @@ impl<'a> IntoContextElement for RValue<'a> {
breadcrumbs: Option<&'b BreadcrumbTree<'b>>,
) -> Option<IceResult<'b>> {
match self {
RValue::RVLiteral(owned_literal) => Some(IceResult::Borrowed(owned_literal)),
RValue::RVLiteral(owned_literal) => Some(IceResult::from_borrowed(owned_literal)),
RValue::RVPath(path) => walk_path(breadcrumbs, &path.keys)
.map(|ice| ice.into_context_element(renderer, breadcrumbs))
.ok()
@@ -82,7 +82,7 @@ impl<'a> IntoContextElement for RValue<'a> {
.render_partial_name(template, breadcrumbs)
.map(|rendered| OwnedLiteral::LString(rendered))
.ok()
.map(|owned_literal| IceResult::Owned(Rc::new(owned_literal))),
.map(|owned_literal| IceResult::from_owned(owned_literal)),
}
}
}