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

Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03) #19683

Merged
merged 6 commits into from Jan 10, 2018
Merged

Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03) #19683

merged 6 commits into from Jan 10, 2018

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Jan 4, 2018 •
edited

Fixes #19635
Fixes #19637
Fixes #19735
Fixes #19519

This change is Reviewable
@SimonSapin
Copy link
Member Author

SimonSapin commented Jan 4, 2018

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2018

⌛ Trying commit c2d3a54 with merge 7c3ead7...
bors-servo added a commit that referenced this pull request Jan 4, 2018
@bors-servo
Auto merge of #19683 - servo:rustup, r=<try>
Loading status checks…
7c3ead7 
[Do not merge] Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03)

Do not merge (yet), as this might bring #19519 back.
@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2018

💔 Test failed - linux-dev
@SimonSapin
Copy link
Member Author

SimonSapin commented Jan 4, 2018

@bors-servo try
@highfive highfive removed the S-tests-failed label Jan 4, 2018
@SimonSapin SimonSapin force-pushed the rustup branch from fe72e0c to bba013f Jan 4, 2018
@jdm
Copy link
Member

jdm commented Jan 4, 2018

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2018

⌛ Trying commit bba013f with merge 6362549...
bors-servo added a commit that referenced this pull request Jan 4, 2018
@bors-servo
Auto merge of #19683 - servo:rustup, r=<try>
Loading status checks…
6362549 
[Do not merge] Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03)

Do not merge (yet), as this might bring #19519 back.

Also blocked on rust-lang/rust#46906 (comment).

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

bors-servo commented Jan 4, 2018

💔 Test failed - linux-dev
@SimonSapin SimonSapin force-pushed the rustup branch from 6e78dc6 to c408895 Jan 4, 2018
@SimonSapin
Copy link
Member Author

SimonSapin commented Jan 4, 2018

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2018

⌛ Trying commit c408895 with merge 9ea6c09...
bors-servo added a commit that referenced this pull request Jan 4, 2018
@bors-servo
Auto merge of #19683 - servo:rustup, r=<try>
Loading status checks…
9ea6c09 
[Do not merge] Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03)

Do not merge (yet), as this might bring #19519 back.

Also blocked on rust-lang/rust#46906 (comment).

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

bors-servo commented Jan 4, 2018

💔 Test failed - mac-dev-unit
@jdm
Copy link
Member

jdm commented Jan 4, 2018

This PR needs to update the stable toolchain as well.
@SimonSapin
Copy link
Member Author

SimonSapin commented Jan 4, 2018 

env RUSTFLAGS=-Dwarnings ./mach build-geckolib
[…]
error: unknown codegen option: `incremental`

I think this is rather due to using Nigthly Cargo with Stable Rust. -C incremental was added in rust-lang/rust#46751 which which will be in Rust 1.24.

I’ll revert ce700f2 for now.
@SimonSapin
Copy link
Member Author

SimonSapin commented Jan 4, 2018

#19395 will also fix that, since in rustup each toolchain has its own Cargo.
@highfive highfive removed the S-tests-failed label Jan 4, 2018
@SimonSapin
Copy link
Member Author

SimonSapin commented Jan 4, 2018

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2018

⌛ Trying commit c710c13 with merge b0a0186...
bors-servo added a commit that referenced this pull request Jan 4, 2018
@bors-servo
Auto merge of #19683 - servo:rustup, r=<try>
Loading status checks…
b0a0186 
[Do not merge] Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03)

Do not merge (yet), as this might bring #19519 back.

Also blocked on rust-lang/rust#46906 (comment).

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

bors-servo commented Jan 4, 2018

💔 Test failed - linux-dev
bors-servo added a commit that referenced this pull request Jan 9, 2018
@bors-servo
Auto merge of #19683 - servo:rustup, r=<try>
Loading status checks…
4416b81 
[Do not merge] Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03)

Do not merge (yet), as this might bring #19519 back.

Fixes #19635
Fixes #19637

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

bors-servo commented Jan 9, 2018

💔 Test failed - linux-rel-wpt
@SimonSapin
Copy link
Member Author

SimonSapin commented Jan 9, 2018 

  ▶ TIMEOUT [expected PASS] /css/CSS2/normal-flow/min-width-046.xht

  │ 
  │ VMware, Inc.
  │ softpipe
  │ 3.3 (Core Profile) Mesa 17.3.0-devel
  │ Failed to receive API response: Io(Error { repr: Os { code: 104, message: "Connection reset by peer" } }) (thread Constellation, at /checkout/src/libcore/result.rs:916)
  │ stack backtrace:
  │    0:     0x7fbed65a03dc - backtrace::backtrace::trace::he6c1181715b03fa2
  │    1:     0x7fbed659f302 - backtrace::capture::Backtrace::new::hd1811a0278c2f95b
  │    2:     0x7fbed3af88b8 - servo::main::{{closure}}::ha7dcf7bba475981b
  │    3:     0x7fbed65af705 - std::panicking::rust_panic_with_hook::hd65467d489bb99a6
  │                         at /checkout/src/libstd/panicking.rs:578
  │    4:     0x7fbed65af51e - std::panicking::begin_panic::h06b05d85af0a01cf
  │                         at /checkout/src/libstd/panicking.rs:538
  │    5:     0x7fbed65af48a - std::panicking::begin_panic_fmt::hdcdf37dcdaa48dbb
  │                         at /checkout/src/libstd/panicking.rs:522
  │    6:     0x7fbed65af422 - rust_begin_unwind
  │                         at /checkout/src/libstd/panicking.rs:498
  │    7:     0x7fbed65e2bb0 - core::panicking::panic_fmt::h1bceab3183b318fb
  │                         at /checkout/src/libcore/panicking.rs:71
  │    8:     0x7fbed5ce40bd - core::result::unwrap_failed::hed1a112f448ae1c9
  │    9:     0x7fbed5cd9b7a - webrender_api::api::RenderApiSender::create_api::hf182596f9295fb14
  │   10:     0x7fbed3c07e76 - constellation::pipeline::UnprivilegedPipelineContent::start_all::hc3ddeb7ce48d0662
  │   11:     0x7fbed3c1df16 - <constellation::constellation::Constellation<Message, LTF, STF>>::new_pipeline::hc8ddd98544dc01db
  │   12:     0x7fbed3c3aa47 - <constellation::constellation::Constellation<Message, LTF, STF>>::handle_request_from_compositor::hfabff537d03e9c02
  │   13:     0x7fbed3c406d9 - <constellation::constellation::Constellation<Message, LTF, STF>>::run::h6b719196ea176504
  │   14:     0x7fbed3b83642 - _ZN3std10sys_common9backtrace28__rust_begin_short_backtrace17h7a2d15315b9db0adE.llvm.51594F29
  │   15:     0x7fbed3c0a4e5 - _ZN3std9panicking3try7do_call17h334403280d97c6e2E.llvm.DCC10A72
  │   16:     0x7fbed65d7cbe - __rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:101
  │   17:     0x7fbed3b88e7a - <F as alloc::boxed::FnBox<A>>::call_box::h278e6c49b413aedf
  │   18:     0x7fbed65c0277 - <alloc::boxed::Box<alloc::boxed::FnBox<A, Output$u3d$R$GT$$u20$$u2b$$u20$$u27$a$GT$$u20$as$u20$core..ops..function..FnOnce$LT$A$GT$$GT$::call_once::h8f49a3821ce4ee9e
  │                         at /checkout/src/liballoc/boxed.rs:827
  │                          - std::sys_common::thread::start_thread::h158502d18950767b
  │                         at /checkout/src/libstd/sys_common/thread.rs:24
  │   19:     0x7fbed65c35c8 - std::sys::unix::thread::Thread::new::thread_start::hafc8f92d56d1a91c
  │                         at /checkout/src/libstd/sys/unix/thread.rs:90
  │   20:     0x7fbed2a10183 - start_thread
  │   21:     0x7fbed12d7ffc - clone
  │   22:                0x0 - <unknown>
  │ ERROR:servo: Failed to receive API response: Io(Error { repr: Os { code: 104, message: "Connection reset by peer" } })
  │ IpcSelectionResult::unwrap(): channel 1 closed (thread ResourceManager, at /home/servo/.cargo/registry/src/github.com-1ecc6299db9ec823/ipc-channel-0.9.0/src/ipc.rs:334)
  │ called `Result::unwrap()` on an `Err` value: Io(Error { repr: Os { code: 104, message: "Connection reset by peer" } }) (thread StorageManager, at /checkout/src/libcore/result.rs:916)
  │ stack backtrace:
  │    0:     0x7fbed65a03dc - backtrace::backtrace::trace::he6c1181715b03fa2
  │    1:     0x7fbed659f302 - backtrace::capture::Backtrace::new::hd1811a0278c2f95b
  │    2:     0x7fbed3af88b8 - servo::main::{{closure}}::ha7dcf7bba475981b
  │    3:     0x7fbed65af705 - std::panicking::rust_panic_with_hook::hd65467d489bb99a6
  │                         at /checkout/src/libstd/panicking.rs:578
  │    4:     0x7fbed65af51e - std::panicking::begin_panic::h06b05d85af0a01cf
  │                         at /checkout/src/libstd/panicking.rs:538
  │    5:     0x7fbed65af48a - std::panicking::begin_panic_fmt::hdcdf37dcdaa48dbb
  │                         at /checkout/src/libstd/panicking.rs:522
  │    6:     0x7fbed5cf2393 - ipc_channel::ipc::IpcSelectionResult::unwrap::h7ed7d23fc9fcbf55
  │    7:     0x7fbed4fc62ea - net::resource_thread::ResourceChannelManager::start::hcf9ca18eb5fdfff1
  │    8:     0x7fbed504bef8 - std::sys_common::backtrace::__rust_begin_short_backtrace::h4281a81479486894
  │    9:     0x7fbed4fd970f - _ZN3std9panicking3try7do_call17h722f9e2ede65ad07E.llvm.3D7055DE
  │   10:     0x7fbed65d7cbe - __rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:101
  │   11:     0x7fbed5027f4d - <F as alloc::boxed::FnBox<A>>::call_box::h46c771b43d6a66a5
  │   12:     0x7fbed65c0277 - <alloc::boxed::Box<alloc::boxed::FnBox<A, Output$u3d$R$GT$$u20$$u2b$$u20$$u27$a$GT$$u20$as$u20$core..ops..function..FnOnce$LT$A$GT$$GT$::call_once::h8f49a3821ce4ee9e
  │                         at /checkout/src/liballoc/boxed.rs:827
  │                          - std::sys_common::thread::start_thread::h158502d18950767b
  │                         at /checkout/src/libstd/sys_common/thread.rs:24
  │   13:     0x7fbed65c35c8 - std::sys::unix::thread::Thread::new::thread_start::hafc8f92d56d1a91c
  │                         at /checkout/src/libstd/sys/unix/thread.rs:90
  │   14:     0x7fbed2a10183 - start_thread
  │   15:     0x7fbed12d7ffc - clone
  │   16:                0x0 - <unknown>
  │ ERROR:servo: IpcSelectionResult::unwrap(): channel 1 closed
  │ stack backtrace:
  │    0:     0x7fbed65a03dc - backtrace::backtrace::trace::he6c1181715b03fa2
  │    1:     0x7fbed659f302 - backtrace::capture::Backtrace::new::hd1811a0278c2f95b
  │    2:     0x7fbed3af88b8 - servo::main::{{closure}}::ha7dcf7bba475981b
  │    3:     0x7fbed65af705 - std::panicking::rust_panic_with_hook::hd65467d489bb99a6
  │                         at /checkout/src/libstd/panicking.rs:578
  │    4:     0x7fbed65af51e - std::panicking::begin_panic::h06b05d85af0a01cf
  │                         at /checkout/src/libstd/panicking.rs:538
  │    5:     0x7fbed65af48a - std::panicking::begin_panic_fmt::hdcdf37dcdaa48dbb
  │                         at /checkout/src/libstd/panicking.rs:522
  │    6:     0x7fbed65af422 - rust_begin_unwind
  │                         at /checkout/src/libstd/panicking.rs:498
  │    7:     0x7fbed65e2bb0 - core::panicking::panic_fmt::h1bceab3183b318fb
  │                         at /checkout/src/libcore/panicking.rs:71
  │    8:     0x7fbed508b16d - core::result::unwrap_failed::h7a4ff2725e4422b2
  │    9:     0x7fbed50334fb - net::storage_thread::StorageManager::start::h3a11dbe304e591fe
  │   10:     0x7fbed504c852 - std::sys_common::backtrace::__rust_begin_short_backtrace::h99fe0a9c5bf9a2ac
  │   11:     0x7fbed4fd963b - _ZN3std9panicking3try7do_call17h2946da1d6a00c3f5E.llvm.3D7055DE
  │   12:     0x7fbed65d7cbe - __rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:101
  │   13:     0x7fbed5028a16 - <F as alloc::boxed::FnBox<A>>::call_box::hcfed3c2a0c736d51
  │   14:     0x7fbed65c0277 - <alloc::boxed::Box<alloc::boxed::FnBox<A, Output$u3d$R$GT$$u20$$u2b$$u20$$u27$a$GT$$u20$as$u20$core..ops..function..FnOnce$LT$A$GT$$GT$::call_once::h8f49a3821ce4ee9e
  │                         at /checkout/src/liballoc/boxed.rs:827
  │                          - std::sys_common::thread::start_thread::h158502d18950767b
  │                         at /checkout/src/libstd/sys_common/thread.rs:24
  │   15:     0x7fbed65c35c8 - std::sys::unix::thread::Thread::new::thread_start::hafc8f92d56d1a91c
  │                         at /checkout/src/libstd/sys/unix/thread.rs:90
  │   16:     0x7fbed2a10183 - start_thread
  │   17:     0x7fbed12d7ffc - clone
  │   18:                0x0 - <unknown>
  └ ERROR:servo: called `Result::unwrap()` on an `Err` value: Io(Error { repr: Os { code: 104, message: "Connection reset by peer" } })

Intermittent?

The ./mach run -r -o output.png job is green though. So it looks like it does not help avoid regress #19519. CC @asajeffrey
@jdm
Copy link
Member

jdm commented Jan 9, 2018

That's #13480.
@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2018

☔ The latest upstream changes (presumably #19395) made this pull request unmergeable. Please resolve the merge conflicts.
@SimonSapin SimonSapin force-pushed the rustup branch from 2f244bf to 63a8fb1 Jan 10, 2018
Eijebong and others added 6 commits Jan 10, 2018
@Eijebong
Bump gl_generator to 0.8
Loading status checks…
54f67c3 
Fixes #19735
@SimonSapin
Don’t set codegen-units to 4.
59bb421 
The default is now 16:
https://github.com/rust-lang/rust/blob/b5361d0d41/src/librustc/session/mod.rs#L738-L788
@SimonSapin
We use Nigthly Cargo with Stable Rust
c8f542a 
Nightly now has incremental compilation as a stable feature,
but that’s not in the stable channel yet.
@SimonSapin
Disable incremental compilation on CI
cee2aad 
We don’t keep the `target` directory between builds,
and incremental cache takes a lot of space.
@SimonSapin
Fix tyvar_behind_raw_pointer warnings
4d459bc 
rust-lang/rust#46906
@SimonSapin
Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03)
Loading status checks…
828780d
@SimonSapin SimonSapin force-pushed the rustup branch from 63a8fb1 to 828780d Jan 10, 2018
@SimonSapin SimonSapin changed the title [Do not merge] Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03) Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03) Jan 10, 2018
@jdm
Copy link
Member

jdm commented Jan 10, 2018

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

bors-servo commented Jan 10, 2018

📌 Commit 828780d has been approved by jdm
@highfive highfive assigned jdm and unassigned glennw Jan 10, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2018

⌛ Testing commit 828780d with merge a22bff8...
bors-servo added a commit that referenced this pull request Jan 10, 2018
@bors-servo
Auto merge of #19683 - servo:rustup, r=jdm
Loading status checks…
a22bff8 
Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03)

Fixes #19635
Fixes #19637
Fixes #19735
Fixes #19519

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

bors-servo commented Jan 10, 2018

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing a22bff8 to master...
@bors-servo bors-servo merged commit 828780d into master Jan 10, 2018
3 of 5 checks passed
3 of 5 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
dependency-ci Checking Dependencies
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@SimonSapin SimonSapin deleted the rustup branch Jan 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@SimonSapin @bors-servo @jdm @glennw @highfive @Eijebong
You can’t perform that action at this time.