-
-
Notifications
You must be signed in to change notification settings - Fork 228
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Moved no-receiver size_hint method to a separate trait #270
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -492,7 +492,7 @@ pub use askama_escape::{Html, Text}; | |
pub trait Template { | ||
/// Helper method which allocates a new `String` and renders into it | ||
fn render(&self) -> Result<String> { | ||
let mut buf = String::with_capacity(Self::size_hint()); | ||
let mut buf = String::with_capacity(self.dyn_size_hint()); | ||
self.render_into(&mut buf)?; | ||
Ok(buf) | ||
} | ||
|
@@ -502,6 +502,10 @@ pub trait Template { | |
fn extension() -> Option<&'static str> | ||
where | ||
Self: Sized; | ||
fn dyn_size_hint(&self) -> usize; | ||
} | ||
|
||
pub trait TemplateSizeHint { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's rename this to |
||
/// Provides an conservative estimate of the expanded length of the rendered template | ||
fn size_hint() -> usize; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would say maybe we can just name this
size_hint()
for now? Not sure if the conflict causes issues in the common case.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If they have the same name then importing
SizedTemplate
and trying to use the receiverlesssize_hint()
will give a "multiple applicable items in scope" compile error ifTemplate
is also imported.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I think I'm okay with that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't it basically make the receiverless
size_hint()
unusable? Or is there a way to disambiguate?(Giving
extension()
the same treatment causes the same compile error intesting/tests/simple.rs
.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can do something like
SizedTemplate::extension(&t)
or<t as SizedTemplate>::extension()
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah yes, it works. I've updated the PR.