Run on Rust stable #151

SimonSapin · 2015-07-27T12:27:59Z

When the "unstable" Cargo feature is given, html5ever’s build script will use html5ever_macros as a library to generate or update src/tree_builder/rules.expanded.rs, which is part of the source tree.

(This feature also enables the corresponding features of tendril and string-cache.)

html5ever_macros is not a plugin anymore, but it still uses libsyntax and still behaves a lot like a syntax extension.

When "unstable" is not given, the build script checks that rules.expanded.rs is up to date (based on a hash of rules.rs) and fails if it’s not.

Tests also run on stable Rust on Travis-CI, but unfortunately most of them are disabled as they dynamically generated using internals of the test crate.

r? @Manishearth

Fixes #53
Closes #151


        Remove usage of some unstable features.

SimonSapin · 2015-07-27T12:31:52Z

Don’t be deterred by the +2,936 lines diff stat, 2,497 of those are src/tree_builder/rules.expanded.rs :)

Ygg01 · 2015-07-27T12:53:02Z

@SimonSapin: I'm wondering, is #112 still active? Will html5ever move to aster in future?

SimonSapin · 2015-07-27T13:42:53Z

I made this close #112, as #112 (comment) indicates that the motivation was stable Rust.

Manishearth · 2015-07-27T14:10:44Z

(commit reviewed)

Manishearth · 2015-07-27T14:14:04Z

Reviewed 8 of 8 files at r1.
Review status: 4 of 39 files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io

Manishearth · 2015-07-27T14:21:23Z

Reviewed 7 of 7 files at r2.
Review status: 6 of 39 files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io

Manishearth · 2015-07-27T14:27:47Z

Reviewed 1 of 1 files at r3, 5 of 6 files at r4.
Review status: 7 of 39 files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io

Manishearth · 2015-07-31T13:18:56Z

Reviewed 1 of 6 files at r4.
Review status: 7 of 39 files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io

Manishearth · 2015-07-31T13:27:36Z

Reviewed 1 of 1 files at r5, 9 of 9 files at r6, 18 of 18 files at r7.
Review status: 24 of 39 files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io

Manishearth · 2015-07-31T13:40:53Z

Reviewed 6 of 6 files at r8, 2 of 2 files at r9, 2 of 2 files at r10, 6 of 6 files at r11, 1 of 1 files at r12, 3 of 3 files at r13, 1 of 1 files at r14.
Review status: all files reviewed at latest revision, 4 unresolved discussions, all commit checks successful.

^{examples/noop-tokenize.rs, line 29 [r11] (raw file):}
Do we have benchmarks? Because this would affect them. It's also possible to write your own blackbox via FFI.

^{examples/print-tree-actions.rs, line 126 [r11] (raw file):}
Can we leave a FIXME here?

^{macros/src/pre_expand.rs, line 48 [r14] (raw file):}
no need for as_str here

^{tests/tokenizer.rs, line 425 [r9] (raw file):}
Why did we do this earlier?

Comments from the review on Reviewable.io

SimonSapin · 2015-07-31T13:56:16Z

Review status: all files reviewed at latest revision, 4 unresolved discussions, all commit checks successful.

^{examples/noop-tokenize.rs, line 29 [r11] (raw file):}
There is benches/tokenizer.rs, but it doesn’t use this file. (It also looks like it’s not built in CI.)

^{examples/print-tree-actions.rs, line 126 [r11] (raw file):}
Done

^{macros/src/pre_expand.rs, line 48 [r14] (raw file):}
Removed.

^{tests/tokenizer.rs, line 426 [r9] (raw file):}
main is not significant when building with --test, the real main function is provided by the test harness. Previously, #[start] was used to override that main function. I removed usage of #[start] because it is unstable, but that’s kinda moot since I didn’t manage to completely port this file to stable. (It uses the test crate to generate tests dynamically.)

So, with 70e3039 we have one test harness instance that finds a single test that happens to be called main and creates another test harness instance. The output looks like:

     Running target/debug/tokenizer-dcf7263c41100ab8

running 1 test

running 13344 tests
test tok: contentModelFlags.test: End tag closing RCDATA or RAWTEXT (case-insensitivity) (in state RawData(Rawtext)) ... ok
test tok: contentModelFlags.test: End tag closing RCDATA or RAWTEXT (case-insensitivity) (in state RawData(Rcdata)) ... ok
[many more lines…]
test tb: webkit02.dat-7 ... ok

test result: ok. 1338 passed; 0 failed; 211 ignored; 0 measured

test main ... ok

test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured

Maybe we’re better off reverting to using #[start] until we find a way to actually run these tests on stable Rust?

Comments from the review on Reviewable.io

Manishearth · 2015-07-31T13:58:16Z

Reviewed 2 of 2 files at r15, 1 of 1 files at r16.
Review status: all files reviewed at latest revision, 1 unresolved discussion, some commit checks pending.

Comments from the review on Reviewable.io


        Use phf_codegen instead of a plugin.


        Ship a copy of rules.rs with match_token! pre-expanded.


        Build on Rust stable

When the "unstable" Cargo feature is given, html5ever’s build script will use html5ever_macros as a library to generate or update src/tree_builder/rules.expanded.rs, which is part of the source tree. (This feature also enables the corresponding features of tendril and string-cache.) html5ever_macros is not a plugin anymore, but it still uses libsyntax and still behaves a lot like a syntax extension. When "unstable" is *not* given, the build script checks that rules.expanded.rs is up to date (based on a hash of rules.rs) and fails if it’s not.


        Move dom_sink::rcdom into the main crate, remove dom_sink::owned_dom.

owned_dom was an interesting experiment, but there is no use for it.


        Merge the test_util crate into the main crate.


        Make tests runable on stable Rust...

... even though tokenizer and tree builder test are disabled as they are created dynamically using internals of the `test` crate.


        Have Travis-CI also test on stable Rust

SimonSapin · 2015-07-31T14:15:11Z

@bors-servo r=Manishearth

bors-servo · 2015-07-31T14:15:12Z

📌 Commit d8c698a has been approved by Manishearth

bors-servo · 2015-07-31T14:15:13Z

⌛ Testing commit d8c698a with merge 7df9461...


        Auto merge of #151 - servo:stable, r=Manishearth

@Manishearth

Run on Rust stable When the "unstable" Cargo feature is given, html5ever’s build script will use html5ever_macros as a library to generate or update `src/tree_builder/rules.expanded.rs`, which is part of the source tree. (This feature also enables the corresponding features of tendril and string-cache.) html5ever_macros is not a plugin anymore, but it still uses libsyntax and still behaves a lot like a syntax extension. When "unstable" is *not* given, the build script checks that rules.expanded.rs is up to date (based on a hash of rules.rs) and fails if it’s not. Tests also run on stable Rust on Travis-CI, but unfortunately most of them are disabled as they dynamically generated using internals of the `test` crate. r? @Manishearth Fixes #53 Closes #151  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/html5ever/151)

bors-servo · 2015-07-31T14:25:02Z

☀️ Test successful - travis

Remove usage of some unstable features.

02312cb

SimonSapin added 7 commits Jul 19, 2015

Use phf_codegen instead of a plugin.

dfc9d21

Ship a copy of rules.rs with match_token! pre-expanded.

beeec3d

Move dom_sink::rcdom into the main crate, remove dom_sink::owned_dom.

9d53fe7

owned_dom was an interesting experiment, but there is no use for it.

Merge the test_util crate into the main crate.

6ea0dfd

Make tests runable on stable Rust...

eeaca13

... even though tokenizer and tree builder test are disabled as they are created dynamically using internals of the `test` crate.

Have Travis-CI also test on stable Rust

Loading status checks…

d8c698a

SimonSapin force-pushed the stable branch from 0501d4c to d8c698a Jul 31, 2015

bors-servo merged commit d8c698a into master Jul 31, 2015
3 checks passed

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

continuous-integration/travis-ci/push The Travis CI build passed
Details

homu Test successful
Details

bors-servo mentioned this pull request Jul 31, 2015

Implement support for form owner #137

Closed

SimonSapin deleted the stable branch Jul 31, 2015

servo / html5ever

Run on Rust stable #151

Run on Rust stable #151

SimonSapin commented Jul 27, 2015

SimonSapin commented Jul 27, 2015

Ygg01 commented Jul 27, 2015

SimonSapin commented Jul 27, 2015

This comment has been minimized.

Manishearth commented on `02312cb` Jul 27, 2015

Manishearth commented Jul 27, 2015

Manishearth commented Jul 27, 2015

Manishearth commented Jul 27, 2015

Manishearth commented Jul 31, 2015

Manishearth commented Jul 31, 2015

Manishearth commented Jul 31, 2015

SimonSapin commented Jul 31, 2015

Manishearth commented Jul 31, 2015

SimonSapin commented Jul 31, 2015

bors-servo commented Jul 31, 2015

bors-servo commented Jul 31, 2015

bors-servo commented Jul 31, 2015

servo / html5ever

Join GitHub today

Run on Rust stable #151

Run on Rust stable #151

Conversation

SimonSapin commented Jul 27, 2015

SimonSapin commented Jul 27, 2015

Ygg01 commented Jul 27, 2015

SimonSapin commented Jul 27, 2015

This comment has been minimized.

Manishearth commented on 02312cb Jul 27, 2015

Manishearth commented Jul 27, 2015

Manishearth commented Jul 27, 2015

Manishearth commented Jul 27, 2015

Manishearth commented Jul 31, 2015

Manishearth commented Jul 31, 2015

Manishearth commented Jul 31, 2015

SimonSapin commented Jul 31, 2015

Manishearth commented Jul 31, 2015

SimonSapin commented Jul 31, 2015

bors-servo commented Jul 31, 2015

bors-servo commented Jul 31, 2015

bors-servo commented Jul 31, 2015

Manishearth commented on `02312cb` Jul 27, 2015