Skip to content
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

Move mock disconnected check to supports_session #104

Merged
merged 1 commit into from Dec 10, 2019

Conversation

@Manishearth
Copy link
Member

Manishearth commented Dec 10, 2019

@jdm
Copy link
Member

jdm commented Dec 10, 2019

$ cargo fmt --all -- --check

Diff in /home/travis/build/servo/webxr/webxr/headless/mod.rs at line 115:

     }

 

     fn supports_session(&self, mode: SessionMode) -> bool {

-        (!self.data.lock().unwrap().disconnected) && (mode == SessionMode::Inline || self.supports_immersive)

+        (!self.data.lock().unwrap().disconnected)

+            && (mode == SessionMode::Inline || self.supports_immersive)

     }

 }
@Manishearth Manishearth force-pushed the Manishearth:disconnected branch from 907f234 to 10a1725 Dec 10, 2019
@Manishearth
Copy link
Member Author

Manishearth commented Dec 10, 2019

Copy link
Member

asajeffrey left a comment

LGTM

@Manishearth
Copy link
Member Author

Manishearth commented Dec 10, 2019

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2019

📌 Commit 10a1725 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2019

Testing commit 10a1725 with merge 29f4f1f...

bors-servo added a commit that referenced this pull request Dec 10, 2019
Move mock disconnected check to supports_session

r? @asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2019

☀️ Test successful - checks-travis
Approved by: asajeffrey
Pushing 29f4f1f to master...

@bors-servo bors-servo merged commit 10a1725 into servo:master Dec 10, 2019
3 checks passed
3 checks passed
Travis CI - Pull Request Build Passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Manishearth Manishearth deleted the Manishearth:disconnected branch Dec 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.