Skip to content
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

make AttrVal tokens() and atom() return or panic #7511

Merged
merged 1 commit into from Sep 2, 2015

Conversation

@psdh
Copy link
Contributor

psdh commented Sep 2, 2015

Fixes #7479

Review on Reviewable

@nox
Copy link
Member

nox commented Sep 2, 2015

Please rename to as_atoms and as_tokens.

@Ms2ger
Copy link
Contributor

Ms2ger commented Sep 2, 2015

r? @nox

@nox
Copy link
Member

nox commented Sep 2, 2015

@psdh This looks good, but #7452 is going to bit-rot it, and I introduced a uint() method there. You are going to need to rebase when the other PR is merged, could you rename uint() accordingly when it is time?

@bors-servo
Copy link
Contributor

bors-servo commented Sep 2, 2015

The latest upstream changes (presumably #7452) made this pull request unmergeable. Please resolve the merge conflicts.

@psdh psdh force-pushed the psdh:attrtokato branch from bbfa862 to 4554aee Sep 2, 2015
@jdm jdm removed the S-needs-rebase label Sep 2, 2015
@psdh psdh force-pushed the psdh:attrtokato branch from 3d8c64b to 105ea0d Sep 2, 2015
@Ms2ger
Copy link
Contributor

Ms2ger commented Sep 2, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Sep 2, 2015

📌 Commit 105ea0d has been approved by Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Sep 2, 2015

Testing commit 105ea0d with merge fa07c49...

bors-servo pushed a commit that referenced this pull request Sep 2, 2015
make AttrVal tokens() and atom() return or panic

Fixes #7479

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7511)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 2, 2015

💔 Test failed - mac-rel-wpt

@@ -69,7 +69,7 @@ impl DOMTokenListMethods for DOMTokenList {
fn Item(&self, index: u32) -> Option<DOMString> {
self.attribute().and_then(|attr| {
let attr = attr.r();
attr.value().tokens().and_then(|tokens| {
Some(attr.value().as_tokens()).and_then(|tokens| {

This comment has been minimized.

@eefriedman

eefriedman Sep 2, 2015

Contributor

This could be cleaned up.

@jdm
Copy link
Member

jdm commented Sep 2, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Sep 2, 2015

Testing commit 105ea0d with merge da02dba...

bors-servo pushed a commit that referenced this pull request Sep 2, 2015
make AttrVal tokens() and atom() return or panic

Fixes #7479

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7511)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 2, 2015

@bors-servo bors-servo merged commit 105ea0d into servo:master Sep 2, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.