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

Rollup of changes #2 #512

Merged
merged 42 commits into from Jun 11, 2013
Merged

Rollup of changes #2 #512

merged 42 commits into from Jun 11, 2013

Conversation

@metajack
Copy link
Contributor

metajack commented Jun 11, 2013

This is try number 2 for #501 rollup.

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on 40a69fc Jun 4, 2013

saw approval from jdm
at pcwalton@40a69fc

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 4, 2013

merging pcwalton/servo/master = 40a69fc into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 4, 2013

pcwalton/servo/master = 40a69fc merged ok, testing candidate = bcedcd2

This comment has been minimized.

@metajack

This comment has been minimized.

Copy link
Owner Author

metajack commented on bb6ae7a Jun 11, 2013

r+

Conflicts:
	src/components/main/layout/box_builder.rs
@metajack

This comment has been minimized.

Copy link
Owner Author

metajack commented on 5425154 Jun 11, 2013

r+

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on 5425154 Jun 11, 2013

saw approval from metajack
at metajack@5425154

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 11, 2013

merging metajack/servo/pcwalton-master = 5425154 into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 11, 2013

metajack/servo/pcwalton-master = 5425154 merged ok, testing candidate = ef57802

This comment has been minimized.

bors-servo pushed a commit that referenced this pull request Jun 11, 2013
metajack added 2 commits Jun 11, 2013
@metajack

This comment has been minimized.

Copy link
Owner Author

metajack commented on 4cf4302 Jun 11, 2013

r+

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on 4cf4302 Jun 11, 2013

saw approval from metajack
at metajack@4cf4302

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 11, 2013

merging metajack/servo/pcwalton-master = 4cf4302 into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 11, 2013

metajack/servo/pcwalton-master = 4cf4302 merged ok, testing candidate = 3a6e06e

bors-servo pushed a commit that referenced this pull request Jun 11, 2013
@metajack

This comment has been minimized.

Copy link
Owner Author

metajack commented on b635079 Jun 11, 2013

r+

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on b635079 Jun 11, 2013

saw approval from metajack
at metajack@b635079

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 11, 2013

merging metajack/servo/pcwalton-master = b635079 into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 11, 2013

metajack/servo/pcwalton-master = b635079 merged ok, testing candidate = 24806ed

This comment has been minimized.

bors-servo pushed a commit that referenced this pull request Jun 11, 2013
@jdm

This comment has been minimized.

Copy link

jdm commented on cdd5de7 Jun 11, 2013

r+

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on cdd5de7 Jun 11, 2013

saw approval from jdm
at metajack@cdd5de7

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 11, 2013

merging metajack/servo/pcwalton-master = cdd5de7 into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 11, 2013

metajack/servo/pcwalton-master = cdd5de7 merged ok, testing candidate = 0ae2081

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 11, 2013

fast-forwarding master to auto = 0ae2081

bors-servo pushed a commit that referenced this pull request Jun 11, 2013
@bors-servo bors-servo merged commit cdd5de7 into servo:master Jun 11, 2013
1 check passed
1 check passed
default all tests passed
@metajack metajack deleted the metajack:pcwalton-master branch Jun 11, 2013
ChrisParis pushed a commit to ChrisParis/servo that referenced this pull request Sep 7, 2014
Rewrite video_007.htm and remove obsolete copies in old-tests; r=denis
glennw pushed a commit to glennw/servo that referenced this pull request Jan 16, 2017
Major refactoring of how clips are processed down the pipeline

This moves the clipping hack down the road (from `Frame` to `FrameBuilder`), allowing to eventually implement multiple transformed clips properly (servo#498), as discussed on IRC with @glennw .

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/512)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request May 1, 2020
Bump cbindgen from 0.14.1 to 0.14.2

Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.14.1 to 0.14.2.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/blob/master/CHANGES">cbindgen's changelog</a>.</em></p>
<blockquote>
<h2>0.14.2</h2>
<pre><code> * Fixed minimal dependency versions. ([#507](eqrion/cbindgen#507))
 * Add an option to write pragma once. ([#511](eqrion/cbindgen#511))
 * Fix submodule scanning for implicit Rust 2018 modules. ([#512](eqrion/cbindgen#512))
 * Fix dependency parsing / scanning to handle target-specific versions. ([#513](eqrion/cbindgen#513))
 * Use heck for case conversion. ([#514](eqrion/cbindgen#514))
 * Add support for verbatim content after includes. ([#416](eqrion/cbindgen#416))
 * Allow to add attributes to most generated functions. ([#515](eqrion/cbindgen#515))
</code></pre>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/eqrion/cbindgen/commit/b6b88f8c3024288287368b377e4d928ddcd2b9e2"><code>b6b88f8</code></a> Release v0.14.2</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/a05a223704e206679068cf84da09a7b49ea202a4"><code>a05a223</code></a> tests: Add tests for attribute annotations.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/5ee5b3ee8884b256decf6e4d91563799a986d758"><code>5ee5b3e</code></a> ir: Allow per-method annotations for all the auto-generated struct and enum m...</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/be8e6ec876972b28519803e041ae12b4c63948fc"><code>be8e6ec</code></a> enum: Allow to store annotations for empty variants.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/1a824c04f21f22d1488609cedf8d0c7b13bb83eb"><code>1a824c0</code></a> Add support for verbatim content after includes</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/d0d67165561c6249d39148bc1b63d62d713fdd1a"><code>d0d6716</code></a> ir: Minor cleanup to the cfg code.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/8139fbf3c7db6e0635161ecc5631d865ac4e3d4e"><code>8139fbf</code></a> Fix <a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/418">#418</a>: Use heck for case conversion</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/4beb526516fa6e1de38cebc3f02b1d095f8947d1"><code>4beb526</code></a> Fix <a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/254">#254</a> (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/512">#512</a>)</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/ca1c0b27b66edc372d7c190e8d22e41125a985a4"><code>ca1c0b2</code></a> Run cargo-fmt</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/1df5129d1a227d5f1dbf66b6d8fe66eba44ae880"><code>1df5129</code></a> Fix 2015 edition module path resolution</li>
<li>Additional commits viewable in <a href="https://github.com/eqrion/cbindgen/compare/v0.14.1...v0.14.2">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.1&new-version=0.14.2)](https://dependabot.com/compatibility-score/?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.1&new-version=0.14.2)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

</details>
bors-servo added a commit that referenced this pull request May 1, 2020
Bump cbindgen from 0.14.1 to 0.14.2

Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.14.1 to 0.14.2.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/blob/master/CHANGES">cbindgen's changelog</a>.</em></p>
<blockquote>
<h2>0.14.2</h2>
<pre><code> * Fixed minimal dependency versions. ([#507](eqrion/cbindgen#507))
 * Add an option to write pragma once. ([#511](eqrion/cbindgen#511))
 * Fix submodule scanning for implicit Rust 2018 modules. ([#512](eqrion/cbindgen#512))
 * Fix dependency parsing / scanning to handle target-specific versions. ([#513](eqrion/cbindgen#513))
 * Use heck for case conversion. ([#514](eqrion/cbindgen#514))
 * Add support for verbatim content after includes. ([#416](eqrion/cbindgen#416))
 * Allow to add attributes to most generated functions. ([#515](eqrion/cbindgen#515))
</code></pre>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/eqrion/cbindgen/commit/b6b88f8c3024288287368b377e4d928ddcd2b9e2"><code>b6b88f8</code></a> Release v0.14.2</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/a05a223704e206679068cf84da09a7b49ea202a4"><code>a05a223</code></a> tests: Add tests for attribute annotations.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/5ee5b3ee8884b256decf6e4d91563799a986d758"><code>5ee5b3e</code></a> ir: Allow per-method annotations for all the auto-generated struct and enum m...</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/be8e6ec876972b28519803e041ae12b4c63948fc"><code>be8e6ec</code></a> enum: Allow to store annotations for empty variants.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/1a824c04f21f22d1488609cedf8d0c7b13bb83eb"><code>1a824c0</code></a> Add support for verbatim content after includes</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/d0d67165561c6249d39148bc1b63d62d713fdd1a"><code>d0d6716</code></a> ir: Minor cleanup to the cfg code.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/8139fbf3c7db6e0635161ecc5631d865ac4e3d4e"><code>8139fbf</code></a> Fix <a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/418">#418</a>: Use heck for case conversion</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/4beb526516fa6e1de38cebc3f02b1d095f8947d1"><code>4beb526</code></a> Fix <a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/254">#254</a> (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/512">#512</a>)</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/ca1c0b27b66edc372d7c190e8d22e41125a985a4"><code>ca1c0b2</code></a> Run cargo-fmt</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/1df5129d1a227d5f1dbf66b6d8fe66eba44ae880"><code>1df5129</code></a> Fix 2015 edition module path resolution</li>
<li>Additional commits viewable in <a href="https://github.com/eqrion/cbindgen/compare/v0.14.1...v0.14.2">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.1&new-version=0.14.2)](https://dependabot.com/compatibility-score/?dependency-name=cbindgen&package-manager=cargo&previous-version=0.14.1&new-version=0.14.2)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

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