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

Explicitly invoke `Au::clamp()` to avoid colliding with the unstable Rust library method of the same name. #37

Merged
merged 1 commit into from Sep 8, 2017

Conversation

Projects
None yet
3 participants
@pcwalton
Copy link
Contributor

pcwalton commented Sep 8, 2017

Fixes breakage from rust-lang/rust#44095.

r? @Manishearth

Explicitly invoke `Au::clamp()` to avoid colliding with the unstable …
…Rust library method of the

same name.

Fixes breakage from rust-lang/rust#44095.

@pcwalton pcwalton requested a review from Manishearth Sep 8, 2017

@pcwalton pcwalton referenced this pull request Sep 8, 2017

Merged

Add clamp functions #44097

@Manishearth

This comment has been minimized.

Copy link
Member

Manishearth commented Sep 8, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Sep 8, 2017

📌 Commit 7136c16 has been approved by Manishearth

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Sep 8, 2017

⌛️ Testing commit 7136c16 with merge 26d07cd...

bors-servo added a commit that referenced this pull request Sep 8, 2017

Auto merge of #37 - pcwalton:clamp, r=Manishearth
Explicitly invoke `Au::clamp()` to avoid colliding with the unstable Rust library method of the same name.

Fixes breakage from rust-lang/rust#44095.

r? @Manishearth
@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Sep 8, 2017

☀️ Test successful - status-travis
Approved by: Manishearth
Pushing 26d07cd to master...

@bors-servo bors-servo merged commit 7136c16 into servo:master Sep 8, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

bors-servo added a commit to servo/servo that referenced this pull request Sep 8, 2017

Auto merge of #18420 - servo:toml, r=nox
Get rustc commit hash from channel manifest

… added in rust-lang/rust#44218, instead of using the GitHub API.

Also upgrade to rustc 1.22.0-nightly (d93036a04 2017-09-07), and app_units 0.5.6 (for servo/app_units#37)

<!-- 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/18420)
<!-- Reviewable:end -->

bors-servo added a commit to servo/servo that referenced this pull request Sep 8, 2017

Auto merge of #18420 - servo:toml, r=nox
Get rustc commit hash from channel manifest

… added in rust-lang/rust#44218, instead of using the GitHub API.

Also upgrade to rustc 1.22.0-nightly (d93036a04 2017-09-07), and app_units 0.5.6 (for servo/app_units#37)

<!-- 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/18420)
<!-- Reviewable:end -->

bors-servo added a commit to servo/servo that referenced this pull request Sep 9, 2017

Auto merge of #18420 - servo:toml, r=<try>
Get rustc commit hash from channel manifest

… added in rust-lang/rust#44218, instead of using the GitHub API.

Also upgrade to rustc 1.22.0-nightly (d93036a04 2017-09-07), and app_units 0.5.6 (for servo/app_units#37)

<!-- 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/18420)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.