Make PgLTree::push infallible and take PgLTreeLabel directly. #1734
Conversation
| @@ -101,20 +101,19 @@ impl PgLTree { | |||
| /// creates ltree from an iterator with checking labels | |||
| pub fn from_iter<I, S>(labels: I) -> Result<Self, PgLTreeParseError> | |||
| where | |||
| S: Into<String>, | |||
| String: From<S>, | |||
There was a problem hiding this comment.
Since you're calling parse() on it, we don't need to copy it to an owned string. I would make this S: AsRef<str> and then do label.as_ref().parse() in the for loop.
There was a problem hiding this comment.
We need owned Strings inside the PgLTreeLabel anyways, I changed PgLTreeLabel::new to take S: Into<String> and changed the call in here from parse()? to PgLTreeLabel::new.
This saves copies when the caller doesn't need to own the string but leaves &str valid!
| pub fn push(&mut self, label: &str) -> Result<(), PgLTreeParseError> { | ||
| self.labels.push(PgLTreeLabel::new(label)?); | ||
| Ok(()) | ||
| pub fn push(&mut self, label: PgLTreeLabel) { |
There was a problem hiding this comment.
This is unfortunately a breaking change, though, and will need to wait for 0.6.0. I don't have an exact timeline on that right now but I expect it to be the next release we do, probably in a month or so.
There was a problem hiding this comment.
Thanks for the info! The work-around is not too terrible anyways
There was a problem hiding this comment.
Thanks for the info! The work-around is not too terrible anyways
You could add a new push_ function with the new signature and leave the existing one as-is.
| pub fn new(label: &str) -> Result<Self, PgLTreeParseError> { | ||
| pub fn new<S>(label: S) -> Result<Self, PgLTreeParseError> | ||
| where | ||
| S: Into<String>, |
There was a problem hiding this comment.
I believe this change too can be seen as a breaking change
There was a problem hiding this comment.
Yep, this can break type inference, so it's breaking.
It shouldn't matter since the push change is breaking anyways and pushes this patch to the next breaking release
Previously the function took strings and parsed them into PgLTreeLabel internally, now it's possible to directlry push PgLTreeLabels onto a PgLTree.
abonander
force-pushed
the
push-typed-ltree-labels
branch
from
bb556d7
to
f813c25
Compare
Previously the function took strings and parsed them into PgLTreeLabel internally, now it's possible to directlry push PgLTreeLabels onto a PgLTree.
It was a bit awkward that pop and push returned different types