Commit graph

24 commits

Author SHA1 Message Date
coalman
3fa74a14ad servo: Merge #16495 - Make tidy check that opening and closing braces that begin a line do … (from coalman:tidy-brace-alignment); r=emilio
…so with proper alignment.

---
<!-- 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 #16486 (github issue number if applicable).

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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 195100f3cac99b979e25157eb437e63bd3262e6f

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 1f340388b3b70f620cbfba6d216955d3ef23b7cb
2017-04-19 03:06:31 -05:00
Corey Farwell
a286b6fb44 servo: Merge #13411 - Migrate mime_classifier top-level string to enum (from frewsxcv:mime); r=jdm
I made this branch months ago and forgot about it. Instead of just throwing the changes away, I rebased off origin/master and opened this pull request. If these changes aren't desired, no feelings hurt, just close this. If they are desired, let me know if there are any changes you want me to make and I'll also need to rewrite/squash the commits.

Source-Repo: https://github.com/servo/servo
Source-Revision: b1d8eff467d3c324e0cc729b06983931000c2680
2016-10-08 15:40:47 -05:00
Corey Farwell
b502835f60 servo: Merge #13652 - Fix capitalization for enum variants (from frewsxcv:variant-naming); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3768ea2cc735a90e22d716d94100305382d17f1b
2016-10-08 14:55:24 -05:00
Corey Farwell
1c5addfe7a servo: Merge #12190 - Minor MIME renaming and aliasing cleanup (from frewsxcv:mime-renaming); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 194fb3e199922ef0e1ce7943036800ecac5bbfe3
2016-07-03 11:07:12 -07:00
Josh Matthews
7f10c47c0a servo: Merge #11472 - Report blank lines that follow an open brace (from jdm:wip); r=mbrubeck
This automates something that I find myself frequently commenting on in PRs.

---
<!-- 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] There are tests for these changes OR

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 3ec20d9cf517c67f4d280e8958cc58c4c2b4fbb2
2016-05-27 18:14:25 -05:00
Corey Farwell
c43335a056 servo: Merge #10640 - Cleanup code regarding mimesniff 'apache bug' (from frewsxcv:apache-flag); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: 6edcad206d0888da1ba845e80d020c488c747131
2016-04-18 23:47:12 +05:01
Jonathan Giddy
34be63f4d0 servo: Merge #9631 - Validate MIME pattern checking (from jongiddy:remove-extra-mask-byte); r=jdm
The MIME detector for a HTML file contains an additional byte in the mask.  While it doesn't hurt, it is not used in the byte matching code (since it is zipped with the `pattern` iterator).

I'm not clear how to test this within the `servo` code. The fix doesn't change any externally visible behavior. A test to validate the `ByteMatcher` structures would require the private ByteMatcher structures to be visible to the test. I could use a sub-module, as described at https://doc.rust-lang.org/book/testing.html#the-tests-module but this pattern doesn't appear anywhere else in the `servo` code.

Source-Repo: https://github.com/servo/servo
Source-Revision: 32c97b6c8d69a284a0f5a30bd68c9b8a8d00b204
2016-02-26 02:28:44 +05:01
Jonathan Giddy
1e0f0ca510 servo: Merge #9618 - Calculate correct mp4 header length (from jongiddy:fix-mp4-size); r=jdm
The calculation of MP4 frame length is incorrect, shifting values by 1 bit instead of 8 bits.  It works for the test MP4 file because the length of the frame is less than 256 bytes, so the shifted values are all zero.

This PR changes the code to calculate the length correctly. It adds a test to check a fake long stream. Still not long enough to test completely, but at least detects the problem with the original code.

Source-Repo: https://github.com/servo/servo
Source-Revision: 520ca258d4f979500f839e13a278bee35bfcc00a
2016-02-13 00:51:58 +05:01
Josh Matthews
647c5be7dd servo: Merge #8190 - Implemementing context-based MIME type sniffing (from jdm:4138); r=eefriedman
This is a rebase of #7842 that also adds a test.
Fixes #4183.

@Yoric, how's this look to you?

Source-Repo: https://github.com/servo/servo
Source-Revision: af1690f3036bc329101bbd6f4e877672d58ca5e0
2015-12-31 20:44:10 +05:01
jmr0
5ed073271e servo: Merge #8685 - tidy rule to warn against use of &String and refactoring (from jmr0:master); r=Ms2ger
Fixes #8681

Source-Repo: https://github.com/servo/servo
Source-Revision: f96e8ce9e8c0a2c9de9574f538718defdcd93c11
2015-11-27 04:19:38 +05:01
Eli Friedman
136cdea614 servo: Merge #7967 - MIMEClassifier::classify always succeeds; fix the type to reflect this (from eefriedman:mime-handling); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 7308d0dd0d2f41e140434d5f992c5aa7ecc0ef71
2015-10-14 08:46:32 -06:00
Mathieu Rheaume
3db547ce58 servo: Merge #7447 - Issue #7382 Use descriptive enums instead of booleans for MIMEClassifier::classifer (from ddrmanxbxfr:master); r=jdm
Hi guys i've done a small pass of refactor in the MIMEClassifier implementation. (See issue #7382 )
   - Moved the predicates to separate functions
   - Added a mimetype enum so we can compare them easily after calling MIMEClassifier::get_media_type

I hope it follows rust good pratices (care it's my first time doing rust).

Improvements and tips are welcome :).

Thanks for looking at it.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8a8204ffc8fa287dde2321c40d12b191b51960da
2015-09-18 07:22:59 -06:00
Simon Martin
b1a37d6095 servo: Merge #7449 - Issue #7393: Properly sniff mislabeled feeds (from simartin:issue_7393); r=metajack
Hi,

This patch is an attempt to fix https://github.com/servo/servo/issues/7393, where the code detecting mislabeled feeds (see https://mimesniff.spec.whatwg.org/#sniffing-a-mislabeled-feed) had spurious space in the URLs we need to match.

Note that my testing (in particular rdf_rss_ko_2.xml) highlighted a flaw in "matches", that failed to check that there were more bytes in the string being checked than in the string we're checking against, which completely broke the whole step 5.2.7.

Thanks in advance for your review.

Cheers,
  Simon

Source-Repo: https://github.com/servo/servo
Source-Revision: 9f85370885c84ebb58cd7f4a72a6e78948f468dc
2015-09-01 11:22:52 -06:00
Johann Tuffe
d9be999626 servo: Merge #7227 - rewrite of mime_classifier.rs to use more iterators (from tafia:tafia-mime_classifier); r=jdm
Rewrite few parts of the file to use more iterators.

Note that I have **no idea** what the code is actually doing functionally, I just tried to mimic exactly what was being done. All tests are ok

Source-Repo: https://github.com/servo/servo
Source-Revision: 9708c63b9c7ae03d65c7add358a98f7213322a3d
2015-08-28 09:35:47 -06:00
Sara Tang
41aeeb280f servo: Merge #7352 - BinaryOrPlaintextClassifier::classify_impl does not need to return Option (from saratang:issue_7347); r=Ms2ger
Fixes for Issue #7347, though I wasn't sure how to test my code afterwards.

Source-Repo: https://github.com/servo/servo
Source-Revision: 78d72f6a9bfa6c2f4828a6e8c83265526b666f1a
2015-08-26 05:53:38 -06:00
Josh Matthews
6a81d499fc servo: Merge #7203 - Add automated style nit checks to test-tidy (from jdm:style); r=Ms2ger
Expands on the work by @wilmoz and cleans up the existing errors. Closes #7180. Closes #7111.

Source-Repo: https://github.com/servo/servo
Source-Revision: e74825f9fde8e222f4ba9bb24b2c2a3864c73e5f
2015-08-16 08:37:40 -06:00
João Oliveira
8410286b02 servo: Merge #7225 - Replace uses of for foo in bar.iter() and for foo in bar.iter_mut() (from jxs:master); r=nox
closes #7197

Source-Repo: https://github.com/servo/servo
Source-Revision: a1b3f477aa541fda4d1b6ccb02c3e56143f4d217
2015-08-15 03:03:21 -06:00
Adrián Arroyo Calle
b5a5e11c26 servo: Merge #7125 - MIME classifier should use &[T] instead of &Vec<T> (from AdrianArroyoCalle:master); r=Ms2ger
Closes #7109

Source-Repo: https://github.com/servo/servo
Source-Revision: a91c366c06be4bf1765dc8be1c019146d5da3b48
2015-08-10 07:04:26 -06:00
Pyfisch
9bacf73484 servo: Merge #6450 - Remove is_some() from mime_classifier.rs (from pyfisch:patch-1); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: b1021c36c53914a42bbc5c6e5ec7795dbf29f9d3
2015-06-23 15:14:30 -06:00
Ms2ger
374d18472e servo: Merge #5827 - Use as_slice less (from Ms2ger:slice); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 79be3b967668e46a4289f4fc8fce2b4f457cab23
2015-04-24 12:12:53 -05:00
Mátyás Mustoha
e3f5a0bd67 servo: Merge #5802 - Fix some irregular indentation (from mmatyas:indentfix); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 43d666f94b9b1b8313d430785946b8d3e020fecf
2015-04-22 19:49:30 -05:00
Edward Cho
a22551161c servo: Merge #5671 - move mime classifier unit tests into unit test crate (from zerokarmaleft:move_mime_classifier_tests); r=SimonSapin
Closes #5667.

Source-Repo: https://github.com/servo/servo
Source-Revision: f67749fc7d9eab13086fbea32b684f3a8eff6688
2015-04-13 16:11:10 -05:00
Mátyás Mustoha
a7040cc135 servo: Merge #5595 - Fix int-related warnings in net/mime_classifier (from mmatyas:net_intfix); r=Ms2ger
Also replaced `for` ranges with `a..b` notation.

Source-Repo: https://github.com/servo/servo
Source-Revision: fe5047e55af384cf08bcb00d5cfe8097ae271833
2015-04-08 19:28:28 -05:00
Josh Matthews
a584e5982d servo: Merge #5005 - Implement MIME sniffing (from jdm:mime-sniffing); r=jdm
This rebases and integrates #4209, removing the sniffer task (turns out it wasn't a great idea), and adds a `--sniff-mime-types` command line flag to enable sniffing for file:// and http:// resources. Tested against a random picture file on my harddrive. The actual MIME sniffing implementation can be extracted into a separate library separately.

Source-Repo: https://github.com/servo/servo
Source-Revision: c7e210f24c97be1057a652b3644332e7043bfeac
2015-04-07 12:48:06 -05:00