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.

Sign up for GitHub

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

Jump to bottom

Update Blob::{new, new_inherited} to take Strings #11768

Merged
merged 1 commit into from
Jun 17, 2016
Merged

Update Blob::{new, new_inherited} to take Strings #11768

merged 1 commit into from
Jun 17, 2016

Conversation

achals
Copy link
Contributor

@achals achals commented Jun 17, 2016 •
edited by larsbergstrom
Loading

  • There are tests for these changes OR
  • These changes do not require tests because no logic changes, only interface changes.

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/websocket.rs, components/script/dom/xmlhttprequest.rs, components/script/dom/file.rs, components/script/dom/blob.rs, components/script/dom/testbinding.rs

@highfive
Copy link

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jun 17, 2016
Ms2ger
Ms2ger reviewed Jun 17, 2016
View reviewed changes
components/script/dom/blob.rs
@@ -156,7 +156,7 @@ impl Blob {
};

let slice = DataSlice::from_bytes(bytes);
Ok(Blob::new(global, BlobImpl::new_from_slice(slice), &blobPropertyBag.get_typestring()))
Ok(Blob::new(global, BlobImpl::new_from_slice(slice), blobPropertyBag.get_typestring().to_owned()))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be able to remove this to_owned call

@Ms2ger
Copy link
Contributor

Ms2ger commented Jun 17, 2016

Nice job, just two small comments.

@jdm jdm assigned Ms2ger and unassigned metajack Jun 17, 2016
@jdm jdm added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jun 17, 2016
@achals
Copy link
Contributor Author

achals commented Jun 17, 2016

Neato, updating.

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Jun 17, 2016
@Ms2ger
Copy link
Contributor

Ms2ger commented Jun 17, 2016

Thank you!

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit af325a9 has been approved by Ms2ger

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jun 17, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit af325a9 with merge 9208b8e...

bors-servo pushed a commit that referenced this pull request Jun 17, 2016
Auto merge of #11768 - achals:blob-string, r=Ms2ger
9208b8e 
Update Blob::{new, new_inherited} to take Strings

<!-- 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
- [X] These changes fix #11762.

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because no logic changes, only interface changes.

<!-- 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/11768)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jun 17, 2016
@highfive
Copy link 

  ▶ FAIL [expected PASS] /css-transforms-1_dev/html/transform3d-translatez-001.htm
  └   → /css-transforms-1_dev/html/transform3d-translatez-001.htm 902d90a8d198625335e738587fdfe81dcc90392d
/css-transforms-1_dev/html/reference/transform3d-translatez-ref.htm b14318ccfd8a59b7b249d41521e178d617678823
Testing 902d90a8d198625335e738587fdfe81dcc90392d == b14318ccfd8a59b7b249d41521e178d617678823
/css-transforms-1_dev/html/transform3d-translatez-001.htm 902d90a8d198625335e738587fdfe81dcc90392d
/css-transforms-1_dev/html/reference/transform3d-translatez-notref.htm 902d90a8d198625335e738587fdfe81dcc90392d
Testing 902d90a8d198625335e738587fdfe81dcc90392d != 902d90a8d198625335e738587fdfe81dcc90392d

@Ms2ger
Copy link
Contributor

Ms2ger commented Jun 17, 2016

@bors-servo retry #11631

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, arm32, arm64, linux-dev, mac-dev-unit, mac-rel-wpt, windows are reusable. Rebuilding only linux-rel, mac-rel-css...

@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

@bors-servo bors-servo merged commit af325a9 into servo:master Jun 17, 2016
@achals achals deleted the blob-string branch June 17, 2016 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ms2ger Ms2ger

Labels
S-tests-failed The changes caused existing tests to fail.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Blob::{new, new_inherited} should take String, not &str.
6 participants
@achals @highfive @Ms2ger @bors-servo @jdm @metajack