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

task -> thread #9201

Merged
merged 1 commit into from Jan 10, 2016
Merged

task -> thread #9201

merged 1 commit into from Jan 10, 2016

Conversation

@ajnirp
Copy link
Contributor

ajnirp commented Jan 8, 2016

for #8512

Review on Reviewable

@highfive
Copy link

highfive commented Jan 8, 2016

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify layout code, but no reftests are modified. Please consider adding a reftest!
This was referenced Jan 8, 2016
@KiChjang
Copy link
Member

KiChjang commented Jan 8, 2016

Fails tidy:

./components/script/dom/dedicatedworkerglobalscope.rs:223: Line is longer than 120 characters
./components/script/dom/storage.rs:71: Line is longer than 120 characters

Also fails to build:

/home/travis/build/servo/servo/tests/unit/net/http_loader.rs:24:5: 24:45 error: unresolved import `net::resource_task::CancellationListener`. Could not find `resource_task` in `net` [E0432]
/home/travis/build/servo/servo/tests/unit/net/http_loader.rs:24 use net::resource_task::CancellationListener;
                                                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/travis/build/servo/servo/tests/unit/net/http_loader.rs:24:5: 24:45 help: run `rustc --explain E0432` to see a detailed explanation
/home/travis/build/servo/servo/tests/unit/net/http_loader.rs:1200:9: 1200:48 error: unresolved import `net::resource_task::CancellableResource`. Could not find `resource_task` in `net` [E0432]
/home/travis/build/servo/servo/tests/unit/net/http_loader.rs:1200     use net::resource_task::CancellableResource;
                                                                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/travis/build/servo/servo/tests/unit/net/http_loader.rs:1200:9: 1200:48 help: run `rustc --explain E0432` to see a detailed explanation
@jdm
Copy link
Member

jdm commented Jan 8, 2016

@bors-servo: delegate+
This is ready to merge once it builds and passes test-tidy.

@bors-servo
Copy link
Contributor

bors-servo commented Jan 8, 2016

✌️ @wenderen can now approve this pull request

@ajnirp ajnirp force-pushed the ajnirp:8512-task-thread branch 2 times, most recently from 77106e6 to dd935ad Jan 8, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jan 9, 2016

The latest upstream changes (presumably #9210) made this pull request unmergeable. Please resolve the merge conflicts.

@ajnirp ajnirp force-pushed the ajnirp:8512-task-thread branch from dd935ad to 45ab87a Jan 9, 2016
@ajnirp
Copy link
Contributor Author

ajnirp commented Jan 9, 2016

r+

@nox
Copy link
Member

nox commented Jan 9, 2016

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jan 9, 2016

📌 Commit 45ab87a has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jan 9, 2016

Testing commit 45ab87a with merge 2a00840...

bors-servo added a commit that referenced this pull request Jan 9, 2016
task -> thread

for #8512

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

bors-servo commented Jan 9, 2016

💔 Test failed - mac-dev-ref-unit

@nox
Copy link
Member

nox commented Jan 9, 2016

clang: error: no such file or directory: 'src/thread_info.c'
clang: error: no input files
thread '<main>' panicked at 'explicit panic', /Users/servo/.cargo/registry/src/github.com-0a35038f75765ae4/gcc-0.3.17/src/lib.rs:768
stack backtrace:
   1:        0x105995da8 - sys::backtrace::tracing::imp::write::hca66179add43b2e5lLt
   2:        0x10599a27f - panicking::log_panic::_<closure>::closure.40842
   3:        0x105999d22 - panicking::log_panic::h7a04edac7e1f2797HEx
   4:        0x1059851a6 - sys_common::unwind::begin_unwind_inner::h39a94087039ae0efnOs
   5:        0x10596cd57 - sys_common::unwind::begin_unwind::begin_unwind::h13679756390154096214
   6:        0x10597ca2b - fail::h347fdab72b7e387duZa
   7:        0x105977360 - run::hf216d327ca11976fQVa
   8:        0x10596dfee - _<impl>::compile_object::h4e58a958d1ed6132yna
   9:        0x105969ab2 - _<impl>::compile::h79cf50932d333253Gja
  10:        0x10596360d - main::hc3af6fac7c1932e6faa
  11:        0x105999aa2 - sys_common::unwind::try::try_fn::h9781900235654175042
  12:        0x1059951e8 - __rust_try
  13:        0x105999949 - rt::lang_start::h7f8cb47bb0ba3293PBx
  14:        0x1059664b9 - main
@ajnirp ajnirp force-pushed the ajnirp:8512-task-thread branch from 45ab87a to 2407aaa Jan 9, 2016
@nox
Copy link
Member

nox commented Jan 10, 2016

browser.rs:13:5: 13:28 error: unresolved import `util::task::spawn_named`. Could not find `task` in `util` [E0432]
browser.rs:13 use util::task::spawn_named;
                  ^~~~~~~~~~~~~~~~~~~~~~~
browser.rs:13:5: 13:28 help: run `rustc --explain E0432` to see a detailed explanation
task.rs:5:5: 5:36 error: unresolved import `interfaces::cef_thread_runner_t`. There is no `cef_thread_runner_t` in `interfaces` [E0432]
task.rs:5 use interfaces::cef_thread_runner_t;
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
task.rs:5:5: 5:36 help: run `rustc --explain E0432` to see a detailed explanation
window.rs:21:36: 21:40 error: unresolved import `compositing::compositor_task`. There is no `compositor_task` in `compositing` [E0432]
window.rs:21 use compositing::compositor_task::{self, CompositorProxy, CompositorReceiver};
                                                ^~~~
window.rs:21:36: 21:40 help: run `rustc --explain E0432` to see a detailed explanation
window.rs:21:42: 21:57 error: unresolved import `compositing::compositor_task::CompositorProxy`. Could not find `compositor_task` in `compositing` [E0432]
window.rs:21 use compositing::compositor_task::{self, CompositorProxy, CompositorReceiver};
                                                      ^~~~~~~~~~~~~~~
window.rs:21:42: 21:57 help: run `rustc --explain E0432` to see a detailed explanation
window.rs:21:59: 21:77 error: unresolved import `compositing::compositor_task::CompositorReceiver`. Could not find `compositor_task` in `compositing` [E0432]
window.rs:21 use compositing::compositor_task::{self, CompositorProxy, CompositorReceiver};
                                                                       ^~~~~~~~~~~~~~~~~~
window.rs:21:59: 21:77 help: run `rustc --explain E0432` to see a detailed explanation
error: aborting due to 5 previous errors
@ajnirp
Copy link
Contributor Author

ajnirp commented Jan 10, 2016

Is there a way I can test the Windows and OS X builds on my Linux machine?

@ajnirp ajnirp force-pushed the ajnirp:8512-task-thread branch from bc42b04 to 1f02c4e Jan 10, 2016
@ajnirp
Copy link
Contributor Author

ajnirp commented Jan 10, 2016

@bors-servo r=jdm

once more unto the breach

@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2016

📌 Commit 1f02c4e has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2016

Testing commit 1f02c4e with merge d3e2f94...

bors-servo added a commit that referenced this pull request Jan 10, 2016
task -> thread

for #8512

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

bors-servo commented Jan 10, 2016

@ajnirp
Copy link
Contributor Author

ajnirp commented Jan 10, 2016

phew

@ajnirp ajnirp deleted the ajnirp:8512-task-thread branch Jan 10, 2016
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

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