Skip to content
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

Fix rebasing error #10465

Merged
merged 1 commit into from Apr 8, 2016
Merged

Fix rebasing error #10465

merged 1 commit into from Apr 8, 2016

Conversation

@stjepang
Copy link
Contributor

stjepang commented Apr 7, 2016

This PR mistakenly removed JIT enabling/disabling by preference:
https://github.com/servo/servo/pull/10342/files
Look for get_pref.

I'm putting the missing piece of code into the appropriate place in
script_runtime.rs

r? @KiChjang


This change is Reviewable

This PR mistakenly removed JIT enabling/disabling by preference:
https://github.com/servo/servo/pull/10342/files
Look for `get_pref`.

I'm putting the missing piece of code into the appropriate place in
script_runtime.rs
@highfive
Copy link

highfive commented Apr 7, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/script_thread.rs, components/script/script_runtime.rs
@highfive
Copy link

highfive commented Apr 7, 2016

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify script code, but no tests are modified. Please consider adding a test!
@KiChjang
Copy link
Member

KiChjang commented Apr 7, 2016

@bors-servo r+

Thanks!

@bors-servo
Copy link
Contributor

bors-servo commented Apr 7, 2016

📌 Commit 4f34422 has been approved by KiChjang

@bors-servo
Copy link
Contributor

bors-servo commented Apr 8, 2016

Testing commit 4f34422 with merge 05532a0...

bors-servo added a commit that referenced this pull request Apr 8, 2016
Fix rebasing error

This PR mistakenly removed JIT enabling/disabling by preference:
https://github.com/servo/servo/pull/10342/files
Look for `get_pref`.

I'm putting the missing piece of code into the appropriate place in
script_runtime.rs

r? @KiChjang

<!-- 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/10465)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 8, 2016

The build was interrupted to prioritize another pull request.

bors-servo added a commit that referenced this pull request Apr 8, 2016
Fix rebasing error

This PR mistakenly removed JIT enabling/disabling by preference:
https://github.com/servo/servo/pull/10342/files
Look for `get_pref`.

I'm putting the missing piece of code into the appropriate place in
script_runtime.rs

r? @KiChjang

<!-- 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/10465)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 8, 2016

Testing commit 4f34422 with merge a6a8033...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 8, 2016

The build was interrupted to prioritize another pull request.

@bors-servo
Copy link
Contributor

bors-servo commented Apr 8, 2016

Testing commit 4f34422 with merge bead958...

bors-servo added a commit that referenced this pull request Apr 8, 2016
Fix rebasing error

This PR mistakenly removed JIT enabling/disabling by preference:
https://github.com/servo/servo/pull/10342/files
Look for `get_pref`.

I'm putting the missing piece of code into the appropriate place in
script_runtime.rs

r? @KiChjang

<!-- 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/10465)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 8, 2016

@bors-servo bors-servo merged commit 4f34422 into servo:master Apr 8, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.