script: Introduce Element::get_attribute_string_value#45023
Merged
TimvdLippe merged 1 commit intoMay 20, 2026
Conversation
|
🔨 Triggering try run (#26148094547) for Linux (WPT) |
mrobinson
reviewed
May 20, 2026
Member
mrobinson
left a comment
There was a problem hiding this comment.
This is really interesting. I would say it likely makes sense to generalize this a bit to allow accessing AttrValue without having to do the conversion to Attr.
Comment on lines
+2043
to
+2053
| pub(crate) fn get_attribute_string_value_with_namespace( | ||
| &self, | ||
| namespace: &Namespace, | ||
| local_name: &LocalName, | ||
| ) -> Option<String> { | ||
| self.attrs | ||
| .borrow() | ||
| .iter() | ||
| .find(|a| a.local_name() == local_name && a.namespace() == namespace) | ||
| .map(|a| String::from(&**a.value())) | ||
| } |
Member
There was a problem hiding this comment.
Would it be possible to return Option<&str>` to avoid an allocation.
Contributor
Author
There was a problem hiding this comment.
I wanted to do that, but I am not sure how to propagate the lifetime of it. Its lifetime relates to the attribute, not the self. Do you have any suggestions on how to do that?
Member
There was a problem hiding this comment.
This is probably okay for now. Maybe I can take a look at this later.
Member
There was a problem hiding this comment.
You likely need Ref::map to return the ref from self.attrs.borrow() to the caller.
Contributor
Author
There was a problem hiding this comment.
I made some attempts, but got stuck since the Ref is inside an AttributesBorrow. Let's merge this PR and optimize this further in subsequent cleanups.
|
Test results for linux-wpt from try job (#26148094547): Flaky unexpected result (71)
Stable unexpected results that are known to be intermittent (11)
|
|
✨ Try run (#26148094547) succeeded. |
Not all accesses to attributes require a `cx`, since most of them don't actually need the `Attr` node, but only the value contained within. Therefore, introduce a variant that directly accesses the value, to avoid materializing attribute nodes. Doing so removes the need for one of the `temp_cx` in XPath, since it only requires the attribute value and not the full node. Part of servo#45022 Signed-off-by: Tim van der Lippe <[email protected]>
ef78082 to
05253ee
Compare
mrobinson
approved these changes
May 20, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Not all accesses to attributes require a
cx, since most of them don't actually need theAttrnode, but only the value contained within. Therefore, introduce a variant that directly accesses the value, to avoid materializing attribute nodes.Doing so removes the need for one of the
temp_cxin XPath, since it only requires the attribute value and not the full node.Part of #45022
Testing: WPT