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

style: Cleanup `Interpolate` code. #11924

Merged
merged 1 commit into from Jun 29, 2016
Merged

Conversation

@emilio
Copy link
Member

emilio commented Jun 29, 2016


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because refactoring.

This change is Reviewable

@highfive
Copy link

highfive commented Jun 29, 2016

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/helpers/animated_properties.mako.rs
@highfive
Copy link

highfive commented Jun 29, 2016

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@emilio emilio force-pushed the emilio:interpolate-cleanup branch from dd2f609 to 3ce2720 Jun 29, 2016
@nox
Copy link
Member

nox commented Jun 29, 2016

Good idea.

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Jun 29, 2016

📌 Commit 3ce2720 has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Jun 29, 2016

Testing commit 3ce2720 with merge 6e566a4...

bors-servo added a commit that referenced this pull request Jun 29, 2016
style: Cleanup `Interpolate` code.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] These changes do not require tests because refactoring.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11924)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 29, 2016

💔 Test failed - linux-rel

this.interpolate(&other, time).unwrap_or(None).and_then(|value| {
Some(LengthOrPercentageOrAuto::Calc(value))
})
if let Ok(maybe) = this.interpolate(&other, time) {

This comment has been minimized.

@Ms2ger

Ms2ger Jun 29, 2016

Contributor
if let Ok(Some(result)) = this.interpolate(&other, time) {

(though I'd use a match)

@nox
Copy link
Member

nox commented Jun 29, 2016

Let's take the intermittent failure as an opportunity to address @Ms2ger's nit.

@emilio emilio force-pushed the emilio:interpolate-cleanup branch from 3ce2720 to 0216c14 Jun 29, 2016
@emilio
Copy link
Member Author

emilio commented Jun 29, 2016

Nit addressed. For the record, the intermittent was #11703.

@bors-servo: r=nox,Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Jun 29, 2016

📌 Commit 0216c14 has been approved by nox,Ms2ger

bors-servo added a commit that referenced this pull request Jun 29, 2016
style: Cleanup `Interpolate` code.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] These changes do not require tests because refactoring.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11924)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 29, 2016

Testing commit 0216c14 with merge c54c405...

@bors-servo
Copy link
Contributor

bors-servo commented Jun 29, 2016

@bors-servo bors-servo merged commit 0216c14 into servo:master Jun 29, 2016
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

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