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

Use 2018-edition idioms in crates that use that edition #22133

Merged
merged 3 commits into from Nov 8, 2018
Merged

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Nov 7, 2018

The first commit is almost entirely mechanical, created by running cargo fix --edition-idioms and relevant crates. I undid the change of adding an anonymous lifetime parameter in types that have implicit lifetimes parameters, for example replacing &mut Formatter with &mut Formatter<'_>, because I don’t like it. The remaining changes are, in many places:

  • Add dyn to trait object types, for example Rc<gl::Gl> to Rc<dyn gl::Gl>. This change also works in the 2015 edition.
  • Remove extern crate where is it made unneeded by changes to the import/module system.

This change is Reviewable

@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 7, 2018

Rubber-stamping because (mostly) auto-generated.

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2018

📌 Commit 8989d3d has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2018

Testing commit 8989d3d with merge 4aee944...

bors-servo added a commit that referenced this pull request Nov 7, 2018
Use 2018-edition idioms in crates that use that edition

The first commit is almost entirely mechanical, created by running `cargo fix --edition-idioms` and relevant crates. I undid the change of adding an anonymous lifetime parameter in types that have implicit lifetimes parameters, for example replacing `&mut Formatter` with `&mut Formatter<'_>`, because I don’t like it. The remaining changes are, in many places:

* Add `dyn` to trait object types, for example `Rc<gl::Gl>` to `Rc<dyn gl::Gl>`. This change also works in the 2015 edition.
* Remove `extern crate` where is it made unneeded by changes to the import/module system.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22133)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2018

💔 Test failed - mac-dev-unit

@SimonSapin SimonSapin force-pushed the extern-crate branch from 8989d3d to 6cd9172 Nov 7, 2018
@SimonSapin SimonSapin force-pushed the extern-crate branch from 6cd9172 to 97f1854 Nov 7, 2018
@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 7, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2018

📌 Commit 97f1854 has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2018

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

@SimonSapin SimonSapin force-pushed the extern-crate branch from 97f1854 to 5d4bc5a Nov 7, 2018
@SimonSapin SimonSapin force-pushed the extern-crate branch 2 times, most recently from 25ea923 to dd91377 Nov 7, 2018
@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 7, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2018

📌 Commit dd91377 has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2018

Testing commit dd91377 with merge 0d6fed4...

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

Testing commit 9f977c5 with merge 6a650d8...

bors-servo added a commit that referenced this pull request Nov 8, 2018
Use 2018-edition idioms in crates that use that edition

The first commit is almost entirely mechanical, created by running `cargo fix --edition-idioms` and relevant crates. I undid the change of adding an anonymous lifetime parameter in types that have implicit lifetimes parameters, for example replacing `&mut Formatter` with `&mut Formatter<'_>`, because I don’t like it. The remaining changes are, in many places:

* Add `dyn` to trait object types, for example `Rc<gl::Gl>` to `Rc<dyn gl::Gl>`. This change also works in the 2015 edition.
* Remove `extern crate` where is it made unneeded by changes to the import/module system.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22133)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

💔 Test failed - status-taskcluster

@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 8, 2018

Uh, this is a new one.

@bors-servo retry

error: failed to run custom build command for `mozjs_sys v0.61.2`
process didn't exit successfully: `C:\Users\task_1541664815\repo\target\debug\build\mozjs_sys-cc0d89accd431be8\build-script-build` (exit code: 101)
--- stdout
[[ /mozjs/js/src/configure -ot /mozjs/js/src/configure.in ]] && touch /mozjs/js/src/configure || true
[[ /mozjs/js/src/old-configure -ot /mozjs/js/src/old-configure.in ]] && touch /mozjs/js/src/old-configure || true
! [[ /mozjs/js/src/configure.in -ot /mozjs/js/src/configure ]] && touch /mozjs/js/src/configure || true
--- stderr
      0 [main] us 0 init_cheap: VirtualAlloc pointer is null, Win32 error 487
AllocationBase 0xCB0000, BaseAddress 0xCB0000, RegionSize 0x1FD000, State 0x2000
C:\Users\task_1541664815\repo\.servo\msvc-dependencies\moztools\3.2\msys\bin\pwd.exe: *** Couldn't reserve space for cygwin's heap, Win32 error 0
      0 [main] us 0 open_stackdumpfile: Dumping stack trace to us.stackdump
      0 [main] sh 3448 sync_with_child: child 4180(0x21C) died before initialization with status code 0xC0000005
     29 [main] sh 3448 sync_with_child: *** child state waiting for longjmp
C:/Users/TASK_1~1/AppData/Local/Temp/make1224-3.sh: fork: Resource temporarily unavailable
mozmake: *** [makefile.cargo:157: maybe-configure] Error 128
thread 'main' panicked at 'assertion failed: result.success()', C:\Users\task_1541664815\.cargo\registry\src\github.com-1ecc6299db9ec823\mozjs_sys-0.61.2\build.rs:110:5
stack backtrace:
   0: <std::sync::barrier::BarrierWaitResult as core::fmt::Debug>::fmt
   1: <std::path::Iter<'a> as core::convert::AsRef<std::path::Path>>::as_ref
   2: std::panicking::take_hook
   3: std::panicking::take_hook
   4: std::panicking::rust_panic_with_hook
   5: std::panicking::begin_panic<str*>
             at \libstd\panicking.rs:410
   6: build_script_build::build_jsapi
@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 8, 2018

@bors-servo retry

@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 8, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

📌 Commit 9f977c5 has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

💣 Failed to start rebuilding: Unknown error

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

Testing commit 9f977c5 with merge f220a63...

bors-servo added a commit that referenced this pull request Nov 8, 2018
Use 2018-edition idioms in crates that use that edition

The first commit is almost entirely mechanical, created by running `cargo fix --edition-idioms` and relevant crates. I undid the change of adding an anonymous lifetime parameter in types that have implicit lifetimes parameters, for example replacing `&mut Formatter` with `&mut Formatter<'_>`, because I don’t like it. The remaining changes are, in many places:

* Add `dyn` to trait object types, for example `Rc<gl::Gl>` to `Rc<dyn gl::Gl>`. This change also works in the 2015 edition.
* Remove `extern crate` where is it made unneeded by changes to the import/module system.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22133)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

💔 Test failed - linux-rel-wpt

@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 8, 2018

  ▶ FAIL [expected PASS] /css/CSS2/margin-padding-clear/padding-right-045.xht
  └   → /css/CSS2/margin-padding-clear/padding-right-045.xht 4e6ec2a4e7504e5c4bb739eb4fad793251d3180f
/css/CSS2/margin-padding-clear/margin-left-004-ref.xht a6cb0bd0ce91bfcc48bdf60c25a6651726baa1dd
Testing 4e6ec2a4e7504e5c4bb739eb4fad793251d3180f == a6cb0bd0ce91bfcc48bdf60c25a6651726baa1dd

Does not reproduce on my machine.

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

💔 Test failed - linux-rel-wpt

@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 8, 2018

  ▶ CRASH [expected ERROR] /xhr/xmlhttprequest-timeout-synconmain.html?timeout after open
  │ 
  │ VMware, Inc.
  │ softpipe
  │ 3.3 (Core Profile) Mesa 18.3.0-devel
  │ Failed to receive a response from live font cache (thread LayoutThread PipelineId { namespace_id: PipelineNamespaceId(1), index: PipelineIndex(1) }, at components/gfx/font_cache_thread.rs:522)
  │ stack backtrace:
  │    0:     0x7fe3ac10740c - backtrace::backtrace::trace::h34a5004b5e0f1dc7
  │    1:     0x7fe3ac1066a2 - <backtrace::capture::Backtrace as core::default::Default>::default::hae829d87a5db9150
  │    2:     0x7fe3ac106718 - backtrace::capture::Backtrace::new::hcbbf9ea3df342ffc
  │    3:     0x7fe3aa2004e9 - servo::main::{{closure}}::h51ba156ea42514d5
  │    4:     0x7fe3ad59bba3 - std::panicking::rust_panic_with_hook::hd470ff3b3e7a1b18
  │                         at libstd/panicking.rs:480
  │    5:     0x7fe3abd37986 - std::panicking::begin_panic::h3d8f65d1b9afa146
  │    6:     0x7fe3abd5bebb - <gfx::font_cache_thread::FontCacheThread as gfx::font_context::FontSource>::get_font_instance::h83316239c8f037aa
  │    7:     0x7fe3ab904160 - <gfx::font_context::FontContext<S>>::font::h92ee79c827e008e3
  │    8:     0x7fe3ab8d6b6b - <core::iter::FilterMap<I, F> as core::iter::iterator::Iterator>::try_fold::{{closure}}::h46c00ff101c3d489
  │    9:     0x7fe3ab8d2cc0 - gfx::font::FontGroup::find_by_codepoint::h04aa08d110af61e9
  │   10:     0x7fe3ab90f577 - layout::text::TextRunScanner::scan_for_runs::h77cb83f2e7f98903
  │   11:     0x7fe3aa6754c8 - <std::thread::local::LocalKey<T>>::with::h405e632d747c390d
  │   12:     0x7fe3aa622cb8 - <layout::construct::FlowConstructor<'a, ConcreteThreadSafeLayoutNode>>::build_flow_for_block_starting_with_fragments::h13fa3c771b67ad1a
  │   13:     0x7fe3aa61f952 - <layout::construct::FlowConstructor<'a, ConcreteThreadSafeLayoutNode>>::build_flow_for_block_like::h50d551f1c4116670
  │   14:     0x7fe3aa61ed4e - <layout::construct::FlowConstructor<'a, ConcreteThreadSafeLayoutNode>>::build_flow_for_block::h0bd9b35d9083b4d0
  │   15:     0x7fe3aa5fa6e2 - <layout::construct::FlowConstructor<'a, ConcreteThreadSafeLayoutNode> as layout::traversal::PostorderNodeMutTraversal<ConcreteThreadSafeLayoutNode>>::process::h81591ffbf9ad826f
  │   16:     0x7fe3aa5dd546 - style::traversal::DomTraversal::handle_postorder_traversal::h6c5ab7160c8a366c
  │   17:     0x7fe3aa661c5d - style::driver::traverse_dom::h08e429af997e2c32
  │   18:     0x7fe3aa5ed616 - layout_thread::LayoutThread::handle_reflow::h865af36f70ceff79
  │   19:     0x7fe3aa5e64fe - layout_thread::LayoutThread::handle_request_helper::ha11bab04be6a62ba
  │   20:     0x7fe3aa5e4d70 - layout_thread::LayoutThread::start::h553aea8f9af0f27c
  │   21:     0x7fe3aa67398d - profile_traits::mem::ProfilerChan::run_with_memory_reporting::h180e2a4774da788b
  │   22:     0x7fe3aa6f7ab1 - _ZN3std10sys_common9backtrace28__rust_begin_short_backtrace17h9c9d09cedf72b540E.llvm.14029494238710957213
  │   23:     0x7fe3aa6c29f5 - _ZN3std9panicking3try7do_call17hc065a76865a6c3ffE.llvm.11438195810872350885
  │   24:     0x7fe3ad5ada19 - __rust_maybe_catch_panic
  │                         at libpanic_unwind/lib.rs:102
  │   25:     0x7fe3aa75dfc0 - <F as alloc::boxed::FnBox<A>>::call_box::h6aa9bc2e4755f0a2
  │   26:     0x7fe3ad598afa - <alloc::boxed::Box<(dyn alloc::boxed::FnBox<A, Output$u3d$R$GT$$u20$$u2b$$u20$$u27$a$RP$$GT$$u20$as$u20$core..ops..function..FnOnce$LT$A$GT$$GT$::call_once::h9d1cd498499ed135
  │                         at liballoc/boxed.rs:682
  │                          - std::sys_common::thread::start_thread::ha4bfe77455e6e434
  │                         at libstd/sys_common/thread.rs:24
  │   27:     0x7fe3ad5860c5 - std::sys::unix::thread::Thread::new::thread_start::hebe133da3ea5230a
  │                         at libstd/sys/unix/thread.rs:90
  │   28:     0x7fe3a7ee9183 - start_thread
  │   29:     0x7fe3a67b003c - clone
  │   30:                0x0 - <unknown>
  │ ERROR 2018-11-08T11:26:28Z: servo: Failed to receive a response from live font cache
  │ Pipeline failed in hard-fail mode.  Crashing!
  └ thread panicked while processing panic. aborting.

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 8, 2018

@bors-servo bors-servo merged commit 9f977c5 into master Nov 8, 2018
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
This was referenced Nov 8, 2018
@SimonSapin SimonSapin deleted the extern-crate branch Nov 8, 2018
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

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