Skip to content

Commit dccbaa3

Browse files
author
bors-servo
authored
Auto merge of #254 - servo:merge-xml5ever, r=nox
Merge xml5ever Discussion at https://github.com/Ygg01/xml5ever/issues/30 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/html5ever/254) <!-- Reviewable:end -->
2 parents e29d495 + cb1ed37 commit dccbaa3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+8616
-0
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "html5lib-tests"]
22
path = html5lib-tests
33
url = https://github.com/html5lib/html5lib-tests
4+
[submodule "xml5lib-tests"]
5+
path = xml5ever/xml5lib-tests
6+
url = https://github.com/Ygg01/xml5lib-tests

scripts/travis-build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ then
1515
cargo test --features "rustc-test/capture" --bench tokenizer
1616
cargo test --features "rustc-test/capture"
1717
cargo test --features "rustc-test/capture unstable"
18+
cargo test --features "rustc-test/capture" --manifest-path xml5ever/Cargo.toml
1819
else
1920
cargo test --bench tokenizer
2021
cargo test
22+
cargo test --manifest-path xml5ever/Cargo.toml
2123
fi
2224

2325
cargo doc
26+
cargo doc --manifest-path xml5ever/Cargo.toml

xml5ever/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
target
2+
Cargo.lock
3+
kcov-master

xml5ever/.travis.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
sudo: false
2+
language: rust
3+
cache: cargo
4+
5+
# necessary for `travis-cargo coveralls --no-sudo`
6+
addons:
7+
apt:
8+
packages:
9+
- libcurl4-openssl-dev
10+
- libelf-dev
11+
- libdw-dev
12+
13+
14+
rust:
15+
- stable
16+
- beta
17+
- nightly
18+
19+
20+
before_script:
21+
- |
22+
pip install 'travis-cargo<0.2' --user &&
23+
export PATH=$HOME/.local/bin:$PATH
24+
25+
# the main build
26+
script:
27+
- |
28+
travis-cargo build &&
29+
travis-cargo doc &&
30+
scripts/travis-build.sh
31+
32+
after_success:
33+
# upload the documentation from the build with beta (automatically only actually
34+
# runs on the master branch)
35+
- curl https://raw.githubusercontent.com/kmcallister/travis-doc-upload/master/travis-doc-upload.sh | sh
36+

xml5ever/CHANGELOG.md

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Change Log
2+
All notable changes to this project will be documented in this file.
3+
This project adheres to [Semantic Versioning](http://semver.org/).
4+
5+
## [0.1.1] - 2016-01-31
6+
### Added
7+
- Add parser based on html5ever
8+
- Add namespace parsing
9+
10+
## [0.1.2] - 2016-04-26
11+
### Added
12+
- Quiescent state for interrupting parser from @ConnorGBrewster
13+
14+
### Fixed
15+
- Bug in namespace parsing of end tag from @bpowers
16+
- Removed mention of `one_input` from README.md from @Ygg01
17+
18+
## [0.1.3] - 2016-05-04
19+
### Fixed
20+
- `complete_script` popped the open script tag instead of getting the current node
21+
22+
## [0.2.0] - 2016-11-02
23+
### Added
24+
- Add `LocalName`, `Prefix`, `Namespace` types. @SimonSapin
25+
- Added `html5ever_macros` instead of `string_cache`. @SimonSapin
26+
27+
### Changed
28+
- Changes API names: @SimonSapin
29+
- `Namespace` -> `NamespaceMap`
30+
- `NamespaceStack`-> `NamespaceMapStack`
31+
32+
33+
### Removed
34+
- Removes `string_cache` in favor of `html5ever_macros`. @SimonSapin
35+
36+
## [0.3.0] - 2016-12-04
37+
### Added
38+
- Support for XML encoding @Ygg01
39+
- Serializer for XML @Ygg01
40+
- Test for serializing namespace @Ygg01
41+
42+
### Changed
43+
- Removed `tokenize_to` method @Ygg01
44+
- Moved parse into a separate driver module @Ygg01
45+
- Moved `atoms!` macro from src/tree_builder/mod.rs into src/lib.rs @Ygg01
46+
- Made NamespaceStack publicly visible but hidden. @Ygg01
47+
- Changed serialization rules, to serialize namespace @Ygg01
48+
- Changed rules for comment parsing. @Ygg01
49+
50+
## [0.3.1] - 2017-01-06
51+
### Added
52+
- Mechanism to signal sink that a node was popped @nox
53+
54+
## [0.3.2] - 2017-01-11
55+
### Changed
56+
- Replaced `println!` with `debug!`in tokenizer @Freyskeyd
57+
58+
## [0.4.0] - 2017-02-17
59+
### Changed
60+
- Updated html5ever-atoms to 0.2
61+
62+
## [0.4.1] - 2017-02-17
63+
### Changed
64+
- Changed dependency constraints to be more precise

xml5ever/Cargo.toml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
[package]
2+
name = "xml5ever"
3+
version = "0.4.2"
4+
description = "Push based streaming parser for xml"
5+
homepage = "https://github.com/servo/html5ever/blob/master/xml5ever/README.md"
6+
documentation = "https://docs.rs/xml5ever/"
7+
repository = "https://github.com/servo/html5ever"
8+
readme = "README.md"
9+
keywords = ["xml", "xml5", "parser", "parsing"]
10+
authors = ["The xml5ever project developers"]
11+
license = "MIT / Apache-2.0"
12+
build = "build.rs"
13+
exclude = ["xml5lib-tests/*"]
14+
15+
[features]
16+
unstable = ["tendril/unstable"]
17+
18+
[dependencies]
19+
time = "0.1"
20+
log = "0.3"
21+
phf = "0.7"
22+
mac = "0.1"
23+
tendril = "0.2"
24+
html5ever-atoms = "0.2"
25+
26+
[dev-dependencies]
27+
rustc-serialize = "0.3.15"
28+
rustc-test = "0.1.3"
29+
30+
[build-dependencies]
31+
phf_codegen = "0.7"
32+
rustc-serialize = "0.3.15"
33+
34+
[profile.dev]
35+
debug = false
36+
37+
[profile.test]
38+
debug = false

xml5ever/LICENSE-APACHE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2015 xml5ever project developers
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

xml5ever/LICENSE-MIT

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Copyright (c) 2014 The xml5ever Project Developers
2+
3+
Permission is hereby granted, free of charge, to any
4+
person obtaining a copy of this software and associated
5+
documentation files (the "Software"), to deal in the
6+
Software without restriction, including without
7+
limitation the rights to use, copy, modify, merge,
8+
publish, distribute, sublicense, and/or sell copies of
9+
the Software, and to permit persons to whom the Software
10+
is furnished to do so, subject to the following
11+
conditions:
12+
13+
The above copyright notice and this permission notice
14+
shall be included in all copies or substantial portions
15+
of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
18+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
19+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
20+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
21+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
22+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
23+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
24+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
25+
DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)