Auto merge of #12258 - izgzhen:remove-data-slice, r=Manishearth

Remove DataSlice, fix #12249

r? @Manishearth

---
<!-- 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 #12249

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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/12258)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-05 06:24:46 -07:00 committed by GitHub
commit 87c7772527
12 changed files with 61 additions and 163 deletions

View file

@ -1,34 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use script::dom::blob::DataSlice;
use std::sync::Arc;
#[test]
fn test_data_slice_without_start_end_should_match_buffer_size() {
let bytes = Arc::new(vec![1u8, 2u8, 3u8]);
let data = DataSlice::new(bytes, None, None);
assert_eq!(data.size(), 3);
}
#[test]
fn test_data_slice_should_prevent_reverse_bounds() {
let bytes = Arc::new(vec![1u8, 2, 3, 4, 5]);
let start = Some(3);
let end = Some(1);
let data = DataSlice::new(bytes, start, end);
assert_eq!(data.size(), 0);
}
#[test]
fn test_data_slice_should_respect_correct_bounds() {
let bytes = Arc::new(vec![1u8, 2, 3, 4, 5]);
let start = Some(1);
let end = Some(3);
let data = DataSlice::new(bytes, start, end);
let expected = [2u8, 3];
assert_eq!(&expected, data.get_bytes());
}

View file

@ -12,6 +12,3 @@ extern crate url;
#[cfg(test)] mod origin;
#[cfg(all(test, target_pointer_width = "64"))] mod size_of;
#[cfg(test)] mod textinput;
#[cfg(test)] mod dom {
mod blob;
}