Skip to content

/ servo

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.

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

Replace catch-all experimental flag with fine-grained boolean prefere… #7391

Merged
merged 2 commits into from Aug 28, 2015
Merged

Replace catch-all experimental flag with fine-grained boolean prefere… #7391

merged 2 commits into from Aug 28, 2015

Conversation

@jdm
Copy link
Member

jdm commented Aug 26, 2015

…nces initialized from a JSON document.

Review on Reviewable
@highfive
Copy link

highfive commented Aug 26, 2015

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@jdm jdm mentioned this pull request Aug 26, 2015
Closed
@jdm jdm force-pushed the jdm:prefs branch 3 times, most recently from 006176d to 3478bf8 Aug 26, 2015
@Ms2ger
Copy link
Contributor

Ms2ger commented Aug 27, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Aug 27, 2015

📌 Commit 3478bf8 has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Aug 27, 2015

⌛ Testing commit 3478bf8 with merge 03c4276...
bors-servo pushed a commit that referenced this pull request Aug 27, 2015
bors-servo
Auto merge of #7391 - jdm:prefs, r=Ms2ger
03c4276 
Replace catch-all experimental flag with fine-grained boolean prefere…

…nces initialized from a JSON document.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7391)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 27, 2015

💔 Test failed - linux1
@Ms2ger
Copy link
Contributor

Ms2ger commented Aug 27, 2015 

   Compiling style_tests v0.0.1 (file:///home/servo/buildbot/slave/linux1/build/components/servo)
/home/servo/buildbot/slave/linux1/build/tests/unit/style/viewport.rs:28:5: 28:43 error: unresolved name `util::opts::set_experimental_enabled` [E0425]
/home/servo/buildbot/slave/linux1/build/tests/unit/style/viewport.rs:28     ::util::opts::set_experimental_enabled(true);
                                                                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/servo/buildbot/slave/linux1/build/tests/unit/style/viewport.rs:28:5: 28:43 help: run `rustc --explain E0425` to see a detailed explanation
/home/servo/buildbot/slave/linux1/build/tests/unit/style/viewport.rs:175:5: 175:43 error: unresolved name `util::opts::set_experimental_enabled` [E0425]
/home/servo/buildbot/slave/linux1/build/tests/unit/style/viewport.rs:175     ::util::opts::set_experimental_enabled(true);
                                                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/servo/buildbot/slave/linux1/build/tests/unit/style/viewport.rs:175:5: 175:43 help: run `rustc --explain E0425` to see a detailed explanation
error: aborting due to 2 previous errors

failures:
    flex_column_direction.html == flex_column_direction_ref.html
    flex_row_direction.html == flex_row_direction_ref.html
    iframe/size_attributes_vertical_writing_mode.html == iframe/size_attributes_vertical_writing_mode_ref.html
    vertical-lr-blocks.html == vertical-lr-blocks_ref.html
    viewport_rule.html == viewport_rule_ref.html
@jdm jdm force-pushed the jdm:prefs branch from ef175ce to c8026f7 Aug 27, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Aug 27, 2015

☔ The latest upstream changes (presumably #7401) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm jdm force-pushed the jdm:prefs branch from c8026f7 to e11efee Aug 28, 2015
@jdm
Copy link
Member Author

jdm commented Aug 28, 2015

Rebased and test failures addressed.
@jdm jdm removed the S-needs-rebase label Aug 28, 2015
@jdm
Replace catch-all experimental flag with fine-grained boolean prefere…
a3ee9b5 
…nces initialized from a JSON document.
@jdm jdm force-pushed the jdm:prefs branch from e11efee to 14f8598 Aug 28, 2015
@jdm
Allow setting preferences from the reftest manifest. Add a command-li…
Loading status checks…
6e26fef 
…ne arg to enable a given preference.
@jdm jdm force-pushed the jdm:prefs branch from 14f8598 to 6e26fef Aug 28, 2015
@jdm
Copy link
Member Author

jdm commented Aug 28, 2015

@Ms2ger Fixed that comment.
@Ms2ger
Copy link
Contributor

Ms2ger commented Aug 28, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Aug 28, 2015

📌 Commit 6e26fef has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Aug 28, 2015

⌛ Testing commit 6e26fef with merge 72125f0...
bors-servo pushed a commit that referenced this pull request Aug 28, 2015
bors-servo
Auto merge of #7391 - jdm:prefs, r=Ms2ger
Loading status checks…
72125f0 
Replace catch-all experimental flag with fine-grained boolean prefere…

…nces initialized from a JSON document.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7391)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 28, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2, mac3
@bors-servo bors-servo merged commit 6e26fef into servo:master Aug 28, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Aug 28, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@jdm @highfive @Ms2ger @bors-servo
You can’t perform that action at this time.