Update to Rust 2016-03-18. #10076

Ms2ger · 2016-03-18T14:09:04Z

This change is

highfive · 2016-03-18T14:09:11Z

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!

jdm · 2016-03-18T14:10:14Z

ports/cef/Cargo.lock

@@ -118,6 +118,11 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
+name = "bitflags"


Two copies of bitflags?

Unfortunately, yes. Worse, 0.5.0 has been released, with a real compat issue (bitflags/bitflags#38). I'd prefer just pushing 0.5 through rather than going through all the deps twice.

jdm · 2016-03-18T14:22:03Z

@bors-servo: r+

bors-servo · 2016-03-18T14:22:04Z

📌 Commit 77cdd97 has been approved by jdm

bors-servo · 2016-03-18T14:33:33Z

⌛ Testing commit 77cdd97 with merge 4ccc5fd...


        Auto merge of #10076 - servo:rustup, r=jdm

Update to Rust 2016-03-18.  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10076)

bors-servo · 2016-03-18T14:36:16Z

💔 Test failed - gonk

Ms2ger · 2016-03-18T14:46:10Z

Depends on sfackler/rust-openssl#361

Ms2ger · 2016-03-18T14:48:00Z

And need to pacify lockfile_changed.sh.

Ms2ger · 2016-03-18T16:17:21Z

@bors-servo r=jdm

bors-servo · 2016-03-18T16:17:21Z

📌 Commit d807fd8 has been approved by jdm

jdm · 2016-03-18T17:00:13Z

@bors-servo: r-

$ ./mach test-compiletest

 Downloading compiletest_rs v0.0.11

   Compiling compiletest_rs v0.0.11

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/procsrv.rs:16:5: 16:37 error: unresolved import `std::dynamic_lib::DynamicLibrary`. Could not find `dynamic_lib` in `std` [E0432]

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/procsrv.rs:16 use std::dynamic_lib::DynamicLibrary;

                                                                                                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/procsrv.rs:16:5: 16:37 help: run `rustc --explain E0432` to see a detailed explanation

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/procsrv.rs:23:9: 23:41 error: the type of this value must be known in this context

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/procsrv.rs:23         path.insert(0, PathBuf::from(p));

                                                                                                                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/compiletest.rs:122:5: 133:6 error: missing field `quiet` in initializer of `test::TestOpts` [E0063]

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/compiletest.rs:122     test::TestOpts {

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/compiletest.rs:123         filter: match config.filter {

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/compiletest.rs:124             None => None,

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/compiletest.rs:125             Some(ref filter) => Some(filter.clone()),

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/compiletest.rs:126         },

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/compiletest.rs:127         run_ignored: config.run_ignored,

                                                                                                                            ...

/home/travis/build/servo/servo/.cargo/registry/src/github.com-88ac128001ac3a9a/compiletest_rs-0.0.11/src/compiletest.rs:122:5: 133:6 help: run `rustc --explain E0063` to see a detailed explanation

error: aborting due to 2 previous errors

Could not compile `compiletest_rs`.

nox · 2016-03-20T02:40:37Z

@bors-servo r=larsbergstrom,manishearth

Updated the manifest.

bors-servo · 2016-03-20T02:40:38Z

📌 Commit 7c22066 has been approved by larsbergstrom,manishearth

bors-servo · 2016-03-20T03:36:28Z

⌛ Testing commit 7c22066 with merge ea46564...


        Auto merge of #10076 - servo:rustup, r=larsbergstrom,manishearth

Update to Rust 2016-03-18.  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10076)

bors-servo · 2016-03-20T04:00:09Z

💔 Test failed - status-appveyor

Manishearth · 2016-03-20T04:02:24Z

So it begins...

   Running `rustc C:/projects/servo/.cargo\\registry\\src\\github.com-88ac128001ac3a9a\\winapi-0.2.5\\src\\lib.rs --crate-name winapi --crate-type lib -g -C metadata=a0bf8c84304ddc12 -C extra-filename=-a0bf8c84304ddc12 --out-dir C:/projects/servo/target\\debug\\deps --emit=dep-info,link -L dependency=C:/projects/servo/target\\debug\\deps -L dependency=C:/projects/servo/target\\debug\\deps --cap-lints allow`
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:148:13: 150:14 error: duplicate definitions with name `item`: [E0201] 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:148             pub unsafe fn $variant(&self) -> &$fieldtype { 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:149                 ::std::mem::transmute(&self.$field)
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:150             } 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\commctrl.rs:2496:1: 2496:59 note: in this expansion of UNION! (defined in C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs) 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:148:13: 150:14 help: run `rustc --explain E0201` to see a detailed explanation 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:148:13: 150:14 note: conflicting definition is here: 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:148             pub unsafe fn $variant(&self) -> &$fieldtype { 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:149                 ::std::mem::transmute(&self.$field)
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:150             } 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\commctrl.rs:2503:1: 2503:59 note: in this expansion of UNION! (defined in C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs) 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:152:13: 154:14 error: duplicate definitions with name `item_mut`: [E0201] 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:152             pub unsafe fn $variantmut(&mut self) -> &mut $fieldtype { 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:153                 ::std::mem::transmute(&mut self.$field)
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:154             } 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\commctrl.rs:2496:1: 2496:59 note: in this expansion of UNION! (defined in C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs) 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:152:13: 154:14 help: run `rustc --explain E0201` to see a detailed explanation 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:152:13: 154:14 note: conflicting definition is here: 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:152             pub unsafe fn $variantmut(&mut self) -> &mut $fieldtype { 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:153                 ::std::mem::transmute(&mut self.$field)
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs:154             } 
C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\commctrl.rs:2503:1: 2503:59 note: in this expansion of UNION! (defined in C:/projects/servo/.cargo\registry\src\github.com-88ac128001ac3a9a\winapi-0.2.5\src\macros.rs)

cc @retep998

retep998 · 2016-03-20T04:48:12Z

Just a case of rust-lang/rust#32247
Please update your winapi to avoid this issue.


        Update to Rust 2016-03-18.

nox · 2016-03-20T09:06:15Z

@bors-servo r=larsbergstrom,manishearth

Bumped winapi.

bors-servo · 2016-03-20T09:06:15Z

📌 Commit 6f679c1 has been approved by larsbergstrom,manishearth

bors-servo · 2016-03-20T09:06:18Z

⌛ Testing commit 6f679c1 with merge aa35d77...


        Auto merge of #10076 - servo:rustup, r=larsbergstrom,manishearth

Update to Rust 2016-03-18.  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10076)

bors-servo · 2016-03-20T10:00:04Z

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, status-appveyor


        Update nightly Rust version to keep in sync with Servo.

Rustup happened in servo/servo#10076


        Auto merge of #245 - servo:travis-bump, r=jdm

Update nightly Rust version to keep in sync with Servo. Rustup happened in servo/servo#10076


        Update rust nightly to keep in sync with Servo.

Rustup happened in servo/servo#10076


        Auto merge of #20 - servo:jdm-patch-1, r=frewsxcv

Update rust nightly to keep in sync with Servo. Rustup happened in servo/servo#10076

highfive assigned nox Mar 18, 2016

highfive added the S-awaiting-review label Mar 18, 2016

jdm reviewed Mar 18, 2016
View changes

jdm assigned jdm and unassigned nox Mar 18, 2016

jdm added S-awaiting-answer and removed S-awaiting-review labels Mar 18, 2016

Ms2ger mentioned this pull request Mar 18, 2016

Update to bitflags 0.5. #10077

Closed

highfive added S-awaiting-merge and removed S-awaiting-answer labels Mar 18, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels Mar 18, 2016

Ms2ger force-pushed the rustup branch from 77cdd97 to d807fd8 Mar 18, 2016

highfive added S-awaiting-review and removed S-tests-failed labels Mar 18, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Mar 18, 2016

nox force-pushed the rustup branch from d807fd8 to 019f1ec Mar 19, 2016

highfive removed the S-awaiting-merge label Mar 19, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Mar 20, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels Mar 20, 2016

Update to Rust 2016-03-18.

Loading status checks…

6f679c1

nox force-pushed the rustup branch from 7c22066 to 6f679c1 Mar 20, 2016

highfive added S-awaiting-review and removed S-tests-failed labels Mar 20, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Mar 20, 2016

bors-servo merged commit 6f679c1 into master Mar 20, 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

nox deleted the rustup branch Mar 20, 2016

frewsxcv added a commit to servo/webrender that referenced this pull request Mar 21, 2016

Update nightly Rust version to keep in sync with Servo.

Loading status checks…

be0e08e

Rustup happened in servo/servo#10076

frewsxcv mentioned this pull request Mar 21, 2016

Update nightly Rust version to keep in sync with Servo. servo/webrender#245

Merged

bors-servo added a commit to servo/webrender that referenced this pull request Mar 21, 2016

Auto merge of #245 - servo:travis-bump, r=jdm

Loading status checks…

233d985

Update nightly Rust version to keep in sync with Servo. Rustup happened in servo/servo#10076

jdm added a commit to servo/webrender_traits that referenced this pull request Mar 21, 2016

Update rust nightly to keep in sync with Servo.

Loading status checks…

ec34dbf

Rustup happened in servo/servo#10076

jdm mentioned this pull request Mar 21, 2016

Update rust nightly to keep in sync with Servo. servo/webrender_traits#20

Merged

bors-servo added a commit to servo/webrender_traits that referenced this pull request Mar 21, 2016

Auto merge of #20 - servo:jdm-patch-1, r=frewsxcv

Loading status checks…

78872db

Update rust nightly to keep in sync with Servo. Rustup happened in servo/servo#10076

servo / servo

Update to Rust 2016-03-18. #10076

Update to Rust 2016-03-18. #10076

Ms2ger commented Mar 18, 2016

highfive commented Mar 18, 2016

This comment has been minimized.

This comment has been minimized.

jdm commented Mar 18, 2016

bors-servo commented Mar 18, 2016

bors-servo commented Mar 18, 2016

bors-servo commented Mar 18, 2016

Ms2ger commented Mar 18, 2016

Ms2ger commented Mar 18, 2016

Ms2ger commented Mar 18, 2016

bors-servo commented Mar 18, 2016

jdm commented Mar 18, 2016

nox commented Mar 20, 2016

bors-servo commented Mar 20, 2016

bors-servo commented Mar 20, 2016

bors-servo commented Mar 20, 2016

Manishearth commented Mar 20, 2016

retep998 commented Mar 20, 2016

nox commented Mar 20, 2016

bors-servo commented Mar 20, 2016

bors-servo commented Mar 20, 2016

bors-servo commented Mar 20, 2016

servo / servo

Join GitHub today

Update to Rust 2016-03-18. #10076

Update to Rust 2016-03-18. #10076

Conversation

Ms2ger commented Mar 18, 2016

highfive commented Mar 18, 2016

This comment has been minimized.

jdm Mar 18, 2016

This comment has been minimized.

Ms2ger Mar 18, 2016

jdm commented Mar 18, 2016

bors-servo commented Mar 18, 2016

bors-servo commented Mar 18, 2016

bors-servo commented Mar 18, 2016

Ms2ger commented Mar 18, 2016

Ms2ger commented Mar 18, 2016

Ms2ger commented Mar 18, 2016

bors-servo commented Mar 18, 2016

jdm commented Mar 18, 2016

nox commented Mar 20, 2016

bors-servo commented Mar 20, 2016

bors-servo commented Mar 20, 2016

bors-servo commented Mar 20, 2016

Manishearth commented Mar 20, 2016

retep998 commented Mar 20, 2016

nox commented Mar 20, 2016

bors-servo commented Mar 20, 2016

bors-servo commented Mar 20, 2016

bors-servo commented Mar 20, 2016