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

Update mozjs. #20419

Merged
merged 1 commit into from Mar 24, 2018
Merged

Update mozjs. #20419

merged 1 commit into from Mar 24, 2018
+125 −81

Conversation

@emilio
Copy link
Member

emilio commented Mar 24, 2018 •
edited by SimonSapin

Peeks up servo/rust-mozjs#408.

This change is Reviewable
@highfive
Copy link

highfive commented Mar 24, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/textdecoder.rs, components/script/dom/webglrenderingcontext.rs
  • @fitzgen: components/script/dom/textdecoder.rs, components/script/dom/webglrenderingcontext.rs
  • @KiChjang: components/script/dom/textdecoder.rs, components/script/dom/webglrenderingcontext.rs
@highfive
Copy link

highfive commented Mar 24, 2018

warning Warning 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!
@emilio
Copy link
Member Author

emilio commented Mar 24, 2018

r? @jdm or @nox
@highfive highfive assigned jdm and unassigned asajeffrey Mar 24, 2018
@jdm
Copy link
Member

jdm commented Mar 24, 2018

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

bors-servo commented Mar 24, 2018

📌 Commit bf6533c has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Mar 24, 2018

⌛ Testing commit bf6533c with merge 9c63a03...
bors-servo added a commit that referenced this pull request Mar 24, 2018
@bors-servo
Auto merge of #20419 - emilio:mozjs-up, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
9c63a03 
Update mozjs.

Peeks up servo/rust-mozjs#408.

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

bors-servo commented Mar 24, 2018

💔 Test failed - linux-rel-css
@jdm
Copy link
Member

jdm commented Mar 24, 2018 

error: variable does not need to be mutable
  --> components/script/dom/dommatrix.rs:64:9
   |
64 |         mut array: CustomAutoRooterGuard<Float32Array>)
   |         ---^^^^^^
   |         |
   |         help: remove this `mut`
   |
   = note: `-D unused-mut` implied by `-D warnings`

error: variable does not need to be mutable
  --> components/script/dom/dommatrix.rs:73:9
   |
73 |         mut array: CustomAutoRooterGuard<Float64Array>)
   |         ---^^^^^^
   |         |
   |         help: remove this `mut`

error: variable does not need to be mutable
   --> components/script/dom/dommatrixreadonly.rs:348:9
    |
348 |         mut array: CustomAutoRooterGuard<Float32Array>)
    |         ---^^^^^^
    |         |
    |         help: remove this `mut`

error: variable does not need to be mutable
   --> components/script/dom/dommatrixreadonly.rs:358:9
    |
358 |         mut array: CustomAutoRooterGuard<Float64Array>)
    |         ---^^^^^^
    |         |
    |         help: remove this `mut`

error: aborting due to 4 previous errors

error: Could not compile `script`.
@bors-servo
Copy link
Contributor

bors-servo commented Mar 24, 2018

☔ The latest upstream changes (presumably #20413) made this pull request unmergeable. Please resolve the merge conflicts.
@emilio
Update mozjs.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
c2f8b04
@emilio emilio force-pushed the emilio:mozjs-up branch from bf6533c to c2f8b04 Mar 24, 2018
@emilio
Copy link
Member Author

emilio commented Mar 24, 2018

@bors-servo r=jdm

  • Outdated tree, whoops
@bors-servo
Copy link
Contributor

bors-servo commented Mar 24, 2018

📌 Commit c2f8b04 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Mar 24, 2018

⌛ Testing commit c2f8b04 with merge b8279b3...
bors-servo added a commit that referenced this pull request Mar 24, 2018
@bors-servo
Auto merge of #20419 - emilio:mozjs-up, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b8279b3 
Update mozjs.

Peeks up servo/rust-mozjs#408.

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

bors-servo commented Mar 24, 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 b8279b3 to master...
@bors-servo bors-servo merged commit c2f8b04 into servo:master Mar 24, 2018
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
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

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