Skip to content

Bindgenup #15216

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jan 26, 2017
Merged

Bindgenup #15216

merged 3 commits into from
Jan 26, 2017

Conversation

emilio
Copy link
Member

@emilio emilio commented Jan 25, 2017 •
edited by larsbergstrom
Loading

r? @heycam

This change is Reviewable

emilio added 2 commits January 25, 2017 10:42
@emilio
Bindgenup.
14692bd 
MozReview-Commit-ID: 7s0GsWaEjwe
Signed-off-by: Emilio Cobos Álvarez <[email protected]>
@emilio
Regenerate in-tree bindings.
ec19f7c 
MozReview-Commit-ID: 4mnAh9y7SY4
Signed-off-by: Emilio Cobos Álvarez <[email protected]>
@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/Cargo.toml, components/style/gecko_bindings/structs_debug.rs, components/style/build_gecko.rs, components/style/gecko_bindings/structs_release.rs, components/style/build.rs

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify style code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jan 25, 2017
@heycam
Copy link
Contributor

heycam commented Jan 25, 2017

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit ec19f7c has been approved by heycam

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jan 25, 2017
@SimonSapin
Copy link
Member

./mach test-tidy fails:

I think updating bindgen to quasi_codegen = "0.29" would fix it, but it’s tricky to test without publishing to crates.io.

./Cargo.lock:1: duplicate versions for package `unicode-xid`
	The following packages depend on version 0.0.3 from 'crates.io':
		syn
		syntex_errors
		syntex_syntax
	The following packages depend on version 0.0.4 from 'crates.io':
		syntex_errors
		syntex_syntax
./Cargo.lock:1: duplicate versions for package `syntex_errors`
	The following packages depend on version 0.50.0 from 'crates.io':
		quasi_codegen
		syntex
		syntex_syntax
	The following packages depend on version 0.54.0 from 'crates.io':
		quasi
		syntex_syntax
./Cargo.lock:1: duplicate versions for package `syntex_syntax`
	The following packages depend on version 0.50.0 from 'crates.io':
		aster
		quasi_codegen
		serde_codegen
		syntex
	The following packages depend on version 0.54.0 from 'crates.io':
		aster
		bindgen
		quasi
./Cargo.lock:1: duplicate versions for package `syntex_pos`
	The following packages depend on version 0.50.0 from 'crates.io':
		syntex_errors
		syntex_syntax
	The following packages depend on version 0.54.0 from 'crates.io':
		syntex_errors
		syntex_syntax
./Cargo.lock:1: duplicate versions for package `aster`
	The following packages depend on version 0.34.0 from 'crates.io':
		quasi_codegen
	The following packages depend on version 0.38.0 from 'crates.io':
		bindgen

@SimonSapin SimonSapin mentioned this pull request Jan 25, 2017
Merged
@SimonSapin
Copy link
Member

rust-lang/rust-bindgen#441 hopefully fixes this.

bors-servo pushed a commit to rust-lang/rust-bindgen that referenced this pull request Jan 25, 2017
Auto merge of #441 - servo:dedup, r=emilio
d8c1512 
Update quasi_codegen to 0.29

This avoids compiling two versions of some crates, which hopefully fixes tidy errors for servo/servo#15216.
bors-servo pushed a commit to rust-lang/rust-bindgen that referenced this pull request Jan 25, 2017
Auto merge of #441 - servo:dedup, r=emilio
e4420b6 
Update quasi_codegen to 0.29

This avoids compiling two versions of some crates, which hopefully fixes tidy errors for servo/servo#15216.
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jan 25, 2017
@emilio
Copy link
Member Author

emilio commented Jan 25, 2017

It doesn't (still conflicting with html5ever build dependencies if I'm not wrong). I just pushed and update and whitelisted those, r? @SimonSapin for the whitelist stuff?

@highfive highfive assigned SimonSapin and unassigned heycam Jan 25, 2017
@SimonSapin SimonSapin mentioned this pull request Jan 25, 2017
Closed
8 tasks
@emilio
Copy link
Member Author

emilio commented Jan 25, 2017

@bors-servo r=heycam

@bors-servo
Copy link
Contributor

📌 Commit 2676658 has been approved by heycam

@highfive highfive assigned heycam and unassigned SimonSapin Jan 25, 2017
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jan 25, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 2676658 with merge 633a05b...

bors-servo pushed a commit that referenced this pull request Jan 25, 2017
Auto merge of #15216 - emilio:bindgenup_, r=heycam
633a05b 
Bindgenup

r? @heycam

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

💔 Test failed - mac-rel-wpt2

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jan 25, 2017
@emilio
Copy link
Member Author

emilio commented Jan 25, 2017 •
edited
Loading

@bors-servo: retry #14323

@emilio
Copy link
Member Author

emilio commented Jan 25, 2017

@bors-servo r=heycam

@bors-servo
Copy link
Contributor

💡 This pull request was already approved, no need to approve it again.

@bors-servo
Copy link
Contributor

📌 Commit 2676658 has been approved by heycam

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jan 25, 2017
@heycam
Copy link
Contributor

heycam commented Jan 26, 2017

@bors-servo p=1

(I'm waiting on this for a mozilla-central -> stylo merge.)

@bors-servo
Copy link
Contributor

⌛ Testing commit 2676658 with merge ef6656a...

bors-servo pushed a commit that referenced this pull request Jan 26, 2017
Auto merge of #15216 - emilio:bindgenup_, r=heycam
ef6656a 
Bindgenup

r? @heycam

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

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev

@bors-servo bors-servo merged commit 2676658 into servo:master Jan 26, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jan 26, 2017
This was referenced Jan 26, 2017
Merged
Closed
@heycam heycam mentioned this pull request Jan 26, 2017
Closed
This was referenced Feb 16, 2017
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@heycam heycam

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@emilio @highfive @heycam @bors-servo @SimonSapin