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

Bindgenup #15216

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 commented Jan 25, 2017 •
edited by larsbergstrom

r? @heycam

This change is Reviewable
emilio added 2 commits Jan 24, 2017
@emilio
Bindgenup.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
14692bd 
MozReview-Commit-ID: 7s0GsWaEjwe
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
@emilio
Regenerate in-tree bindings.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
ec19f7c 
MozReview-Commit-ID: 4mnAh9y7SY4
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
@highfive
Copy link

highfive commented Jan 25, 2017

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

highfive commented Jan 25, 2017

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!
@heycam
Copy link
Member

heycam commented Jan 25, 2017

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

bors-servo commented Jan 25, 2017

📌 Commit ec19f7c has been approved by heycam
@SimonSapin
Copy link
Member

SimonSapin commented Jan 25, 2017

./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

SimonSapin commented Jan 25, 2017

rust-lang/rust-bindgen#441 hopefully fixes this.
bors-servo added a commit to rust-lang/rust-bindgen that referenced this pull request Jan 25, 2017
@bors-servo
Auto merge of #441 - servo:dedup, r=emilio
Loading status checks…
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 added a commit to rust-lang/rust-bindgen that referenced this pull request Jan 25, 2017
@bors-servo
Auto merge of #441 - servo:dedup, r=emilio
Loading status checks…
e4420b6 
Update quasi_codegen to 0.29

This avoids compiling two versions of some crates, which hopefully fixes tidy errors for servo/servo#15216.
@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
7 of 8 tasks complete
@emilio
Update bindgen and related dependencies.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
2676658
@emilio emilio force-pushed the emilio:bindgenup_ branch from df93a97 to 2676658 Jan 25, 2017
@emilio
Copy link
Member Author

emilio commented Jan 25, 2017

@bors-servo r=heycam
@bors-servo
Copy link
Contributor

bors-servo commented Jan 25, 2017

📌 Commit 2676658 has been approved by heycam
@highfive highfive assigned heycam and unassigned SimonSapin Jan 25, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jan 25, 2017

⌛ Testing commit 2676658 with merge 633a05b...
bors-servo added a commit that referenced this pull request Jan 25, 2017
@bors-servo
Auto merge of #15216 - emilio:bindgenup_, r=heycam
Loading status checks…
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

bors-servo commented Jan 25, 2017

💔 Test failed - mac-rel-wpt2
@emilio
Copy link
Member Author

emilio commented Jan 25, 2017 •
edited

@bors-servo: retry #14323
@emilio
Copy link
Member Author

emilio commented Jan 25, 2017

@bors-servo r=heycam
@bors-servo
Copy link
Contributor

bors-servo commented Jan 25, 2017

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

  • There's another pull request that is currently being tested, blocking this pull request: #15220
@bors-servo
Copy link
Contributor

bors-servo commented Jan 25, 2017

📌 Commit 2676658 has been approved by heycam
@heycam
Copy link
Member

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

bors-servo commented Jan 26, 2017

⌛ Testing commit 2676658 with merge ef6656a...
bors-servo added a commit that referenced this pull request Jan 26, 2017
@bors-servo
Auto merge of #15216 - emilio:bindgenup_, r=heycam
Loading status checks…
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

bors-servo commented Jan 26, 2017

☀️ 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
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 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
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@emilio @highfive @heycam @bors-servo @SimonSapin
You can’t perform that action at this time.