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 #501

Merged
merged 31 commits into from Jun 11, 2013
Merged

Rollup of changes #501

merged 31 commits into from Jun 11, 2013

Conversation

@pcwalton
Copy link
Contributor

pcwalton commented Jun 1, 2013

Here's a large laundry list of changes.

@pcwalton
Copy link
Contributor Author

pcwalton commented Jun 4, 2013

r? @jdm

@brson
Copy link
Contributor

brson commented Jun 4, 2013

This looks amazing!

@jdm

This comment has been minimized.

Copy link

jdm commented on src/components/main/layout/layout_task.rs in f77eef5 Jun 4, 2013

Why not <=?

@jdm

This comment has been minimized.

Copy link

jdm commented on src/components/main/layout/layout_task.rs in f77eef5 Jun 4, 2013

doc_url isn't actually used anywhere, so let's just scrap it.

@jdm

This comment has been minimized.

Copy link

jdm commented on src/components/main/layout/block.rs in d5e4793 Jun 4, 2013

Drop the space before &

@jdm

This comment has been minimized.

Copy link

jdm commented on src/components/main/layout/block.rs in d5e4793 Jun 4, 2013

Space before {

@jdm

This comment has been minimized.

Copy link

jdm commented on src/components/main/layout/block.rs in d5e4793 Jun 4, 2013

Space before (, but unnecessary outer ()

@jdm

This comment has been minimized.

Copy link

jdm commented on 40a69fc Jun 4, 2013

r+

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

bors-servo pushed a commit that referenced this pull request Jun 4, 2013
Here's a large laundry list of changes.
Also, standardize on the name "reflow" instead of "relayout" or "build".
@jdm

This comment has been minimized.

Copy link

jdm commented on src/components/main/layout/layout_task.rs in 7a435fc Jun 5, 2013

Is it safe to only pass the node that changed right now? We'll end up constructing a flow tree starting from it, and using that for our display lists for rendering later. It looks to me like we should always pass the document root and optionally pass a root node for restyling for the time being.

@jdm
Copy link
Member

jdm commented Jun 6, 2013

Also, this is why the pull failed:

16:22:27     INFO -  gcc -m32 -o now.o -c      -fPIC -Wall -g -fno-inline -fPIC  -UNDEBUG -DDEBUG_mock_mozilla  -DDEBUG=1 -DHAVE_VISIBILITY_HIDDEN_ATTRIBUTE=1 -DHAVE_VISIBILITY_PRAGMA=1 -DXP_UNIX=1 -D_GNU_SOURCE=1 -DHAVE_FCNTL_FILE_LOCKING=1 -DLINUX=1 -Di386=1 -D_REENTRANT=1  -DFORCE_PR_LOG -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM   /builds/slave/linux/build/src/support/nss/nspr/config/now.c
16:22:27     INFO -  In file included from /usr/include/features.h:385,
16:22:27     INFO -                   from /usr/include/stdio.h:28,
16:22:27     INFO -                   from /builds/slave/linux/build/src/support/nss/nspr/config/now.c:6:
16:22:27     INFO -  /usr/include/gnu/stubs.h:7:27: error: gnu/stubs-32.h: No such file or directory
16:22:27     INFO -  make[2]: *** [now.o] Error 1
16:22:27     INFO -  make[2]: Leaving directory `/builds/slave/linux/build/objdir/src/support/nss/nspr/config'
16:22:27     INFO -  make[1]: *** [export] Error 2
16:22:27     INFO -  make[1]: Leaving directory `/builds/slave/linux/build/objdir/src/support/nss/nspr'
16:22:27     INFO -  make: *** [/builds/slave/linux/build/objdir/src/support/nss/nspr/lib*.dummy] Error 2
@jdm
Copy link
Member

jdm commented Jun 6, 2013

We may need to invoke configure with --enable-64bit, according to http://lists.basho.com/pipermail/riak-users_lists.basho.com/2010-February/000449.html.

@jdm

This comment has been minimized.

Copy link

jdm commented on src/components/main/layout/context.rs in ae5b2df Jun 6, 2013

Please don't reintroduce this.

@jdm

This comment has been minimized.

Copy link

jdm commented on c65d51f Jun 6, 2013

r+

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on c65d51f Jun 6, 2013

saw approval from jdm
at pcwalton@c65d51f

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 6, 2013

merging pcwalton/servo/master = c65d51f into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 6, 2013

pcwalton/servo/master = c65d51f merged ok, testing candidate = 2eaef88

This comment has been minimized.

bors-servo pushed a commit that referenced this pull request Jun 6, 2013
Here's a large laundry list of changes.
@pcwalton

This comment has been minimized.

Copy link
Owner Author

pcwalton commented on 98a730c Jun 6, 2013

r+

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on 98a730c Jun 6, 2013

saw approval from pcwalton
at pcwalton@98a730c

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 6, 2013

merging pcwalton/servo/master = 98a730c into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jun 6, 2013

pcwalton/servo/master = 98a730c merged ok, testing candidate = b797a8a

This comment has been minimized.

bors-servo pushed a commit that referenced this pull request Jun 6, 2013
Here's a large laundry list of changes.
@metajack metajack mentioned this pull request Jun 11, 2013
bors-servo pushed a commit that referenced this pull request Jun 11, 2013
bors-servo pushed a commit that referenced this pull request Jun 11, 2013
bors-servo pushed a commit that referenced this pull request Jun 11, 2013
bors-servo pushed a commit that referenced this pull request Jun 11, 2013
@bors-servo bors-servo merged commit 98a730c into servo:master Jun 11, 2013
1 check failed
1 check failed
default some tests failed
ChrisParis pushed a commit to ChrisParis/servo that referenced this pull request Sep 7, 2014
@jdm jdm mentioned this pull request Nov 5, 2019
bors-servo added a commit that referenced this pull request Apr 24, 2020
Bump cbindgen from 0.9.1 to 0.14.1

Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.9.1 to 0.14.1.
<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.1</h2>
<pre><code> * Handle mangling pointers. ([#508](eqrion/cbindgen#508))
 * Unconditionally generate a return statement in partialeq implementations. ([#509](eqrion/cbindgen#509))
</code></pre>
<h2>0.14.0</h2>
<pre><code> * Minor tweak at how [export.exclude] is handled to allow excluding
   generic instantiations in C mode. ([#501](eqrion/cbindgen#501))
 * Documented cpp_compat option. ([#496](eqrion/cbindgen#496))
 * Fixed a panic when parsing associated constants for a built-in type. ([#494](eqrion/cbindgen#494))
</code></pre>
<h2>0.13.2</h2>
<pre><code> * Constants now have suitable documentation. ([#471](eqrion/cbindgen#471))
 * Fixed some C warnings by emitting void when there are no arguments. ([#470](eqrion/cbindgen#470))
 * Avoids reading cargo.toml when not needed, which can cause panics in workspace situations.
 * Only write `default` cases if the switch is not exhaustive. ([#475](eqrion/cbindgen#475))
 * Some warnings have been refined. ([#477](eqrion/cbindgen#477))
 * Code generation for static arrays has been fixed. ([#479](eqrion/cbindgen#479))
 * Opt-in support for constexpr in constants. ([#481](eqrion/cbindgen#481))
 * Fix C code generation and some warnings when extremely large constants are used. ([#490](eqrion/cbindgen#490))
 * Proper escaping of enum variants and fields. ([#483](eqrion/cbindgen#483))
 * Added support for RefCell (as an opaque type) and Cell. ([#489](eqrion/cbindgen#489))
</code></pre>
<h2>0.13.1</h2>
<pre><code> * Support `#[cfg]` on individual enum variants. ([#469](eqrion/cbindgen#469))
</code></pre>
<h2>0.13.0</h2>
<pre><code> * Support 'swift_name' attributes on generated functions ([#449](eqrion/cbindgen#449))
 * Add [export.pre_body] to config ([#452](eqrion/cbindgen#452))
 * Handle new line in doc attribute ([#454](eqrion/cbindgen#454))
 * Add support for `Self` in tagged enums, structs and unions ([#455](eqrion/cbindgen#455), [#455](eqrion/cbindgen#455), [#456](eqrion/cbindgen#456))
 * Make sentinel variant respect regular config ([#459](eqrion/cbindgen#459))
 * Fix layout of tagged enums with size under some configurations ([#463](eqrion/cbindgen#463))
 * Add an option to allow configuring the order of function names in generated headers ([#466](eqrion/cbindgen#466))
</code></pre>
<h2>0.12.2</h2>
<pre><code> * Fixed version detection with lockfile v2. eqrion/cbindgen#446
 * Added support for export_name on functions. eqrion/cbindgen#447
</code></pre>
<h2>0.12.1</h2>
<pre><code> * Added support for #[repr*64)] on enums. eqrion/cbindgen#441
 * Added support to generate plain enums instead of enum classes for C++. eqrion/cbindgen#443
 * Fixed dependency resolution with lockfile v2. eqrion/cbindgen#438
</code></pre>
</tr></table> ... (truncated)
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/eqrion/cbindgen/commit/0761b9bbe48d01ded1bbec45bbeea5544b3b1002"><code>0761b9b</code></a> Release 0.14.1</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/33d9ecf11f300bd03f431e9f3417c063e681380c"><code>33d9ecf</code></a> Handle mangling pointers.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/0fed9eebc47abcd31e0e69357cd39262c8a5a6cc"><code>0fed9ee</code></a> enum: Unconditionally generate a return statement in partialeq implementations.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/a519f1bda444a0c6c01464296a052d9a05e1d9c4"><code>a519f1b</code></a> Actually use the temp dir for temporary compiled objects.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/4a38a48937264d6ec162b2fd47ffd0e7a091ca72"><code>4a38a48</code></a> Release 0.14.0</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/39bae60ad7ac4711d8fccc0d098ecef98b37d559"><code>39bae60</code></a> Generate test object files in a temporary directory instead of in-tree</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/ec1631f3e47686e6e0c1b7641bb08b0e39c59250"><code>ec1631f</code></a> Allow excluding monomorph structs in C mode.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/6fd245096dcd5c50c1065b4bd6ce62a09df0b39b"><code>6fd2450</code></a> Add missing cpp_compat documentation.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/c265a7562a5ee815057efcc8b1aca31cd3d5318d"><code>c265a75</code></a> parser: Don't panic when finding associated constants to a primitive.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/17d7aad7d07dce8aa665aedbc75c39953afe1600"><code>17d7aad</code></a> Release v0.13.2</li>
<li>Additional commits viewable in <a href="https://github.com/eqrion/cbindgen/compare/v0.9.1...v0.14.1">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.9.1&new-version=0.14.1)](https://dependabot.com/compatibility-score/?dependency-name=cbindgen&package-manager=cargo&previous-version=0.9.1&new-version=0.14.1)

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 Apr 24, 2020
Bump cbindgen from 0.9.1 to 0.14.1

Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.9.1 to 0.14.1.
<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.1</h2>
<pre><code> * Handle mangling pointers. ([#508](eqrion/cbindgen#508))
 * Unconditionally generate a return statement in partialeq implementations. ([#509](eqrion/cbindgen#509))
</code></pre>
<h2>0.14.0</h2>
<pre><code> * Minor tweak at how [export.exclude] is handled to allow excluding
   generic instantiations in C mode. ([#501](eqrion/cbindgen#501))
 * Documented cpp_compat option. ([#496](eqrion/cbindgen#496))
 * Fixed a panic when parsing associated constants for a built-in type. ([#494](eqrion/cbindgen#494))
</code></pre>
<h2>0.13.2</h2>
<pre><code> * Constants now have suitable documentation. ([#471](eqrion/cbindgen#471))
 * Fixed some C warnings by emitting void when there are no arguments. ([#470](eqrion/cbindgen#470))
 * Avoids reading cargo.toml when not needed, which can cause panics in workspace situations.
 * Only write `default` cases if the switch is not exhaustive. ([#475](eqrion/cbindgen#475))
 * Some warnings have been refined. ([#477](eqrion/cbindgen#477))
 * Code generation for static arrays has been fixed. ([#479](eqrion/cbindgen#479))
 * Opt-in support for constexpr in constants. ([#481](eqrion/cbindgen#481))
 * Fix C code generation and some warnings when extremely large constants are used. ([#490](eqrion/cbindgen#490))
 * Proper escaping of enum variants and fields. ([#483](eqrion/cbindgen#483))
 * Added support for RefCell (as an opaque type) and Cell. ([#489](eqrion/cbindgen#489))
</code></pre>
<h2>0.13.1</h2>
<pre><code> * Support `#[cfg]` on individual enum variants. ([#469](eqrion/cbindgen#469))
</code></pre>
<h2>0.13.0</h2>
<pre><code> * Support 'swift_name' attributes on generated functions ([#449](eqrion/cbindgen#449))
 * Add [export.pre_body] to config ([#452](eqrion/cbindgen#452))
 * Handle new line in doc attribute ([#454](eqrion/cbindgen#454))
 * Add support for `Self` in tagged enums, structs and unions ([#455](eqrion/cbindgen#455), [#455](eqrion/cbindgen#455), [#456](eqrion/cbindgen#456))
 * Make sentinel variant respect regular config ([#459](eqrion/cbindgen#459))
 * Fix layout of tagged enums with size under some configurations ([#463](eqrion/cbindgen#463))
 * Add an option to allow configuring the order of function names in generated headers ([#466](eqrion/cbindgen#466))
</code></pre>
<h2>0.12.2</h2>
<pre><code> * Fixed version detection with lockfile v2. eqrion/cbindgen#446
 * Added support for export_name on functions. eqrion/cbindgen#447
</code></pre>
<h2>0.12.1</h2>
<pre><code> * Added support for #[repr*64)] on enums. eqrion/cbindgen#441
 * Added support to generate plain enums instead of enum classes for C++. eqrion/cbindgen#443
 * Fixed dependency resolution with lockfile v2. eqrion/cbindgen#438
</code></pre>
</tr></table> ... (truncated)
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/eqrion/cbindgen/commit/0761b9bbe48d01ded1bbec45bbeea5544b3b1002"><code>0761b9b</code></a> Release 0.14.1</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/33d9ecf11f300bd03f431e9f3417c063e681380c"><code>33d9ecf</code></a> Handle mangling pointers.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/0fed9eebc47abcd31e0e69357cd39262c8a5a6cc"><code>0fed9ee</code></a> enum: Unconditionally generate a return statement in partialeq implementations.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/a519f1bda444a0c6c01464296a052d9a05e1d9c4"><code>a519f1b</code></a> Actually use the temp dir for temporary compiled objects.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/4a38a48937264d6ec162b2fd47ffd0e7a091ca72"><code>4a38a48</code></a> Release 0.14.0</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/39bae60ad7ac4711d8fccc0d098ecef98b37d559"><code>39bae60</code></a> Generate test object files in a temporary directory instead of in-tree</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/ec1631f3e47686e6e0c1b7641bb08b0e39c59250"><code>ec1631f</code></a> Allow excluding monomorph structs in C mode.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/6fd245096dcd5c50c1065b4bd6ce62a09df0b39b"><code>6fd2450</code></a> Add missing cpp_compat documentation.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/c265a7562a5ee815057efcc8b1aca31cd3d5318d"><code>c265a75</code></a> parser: Don't panic when finding associated constants to a primitive.</li>
<li><a href="https://github.com/eqrion/cbindgen/commit/17d7aad7d07dce8aa665aedbc75c39953afe1600"><code>17d7aad</code></a> Release v0.13.2</li>
<li>Additional commits viewable in <a href="https://github.com/eqrion/cbindgen/compare/v0.9.1...v0.14.1">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.9.1&new-version=0.14.1)](https://dependabot.com/compatibility-score/?dependency-name=cbindgen&package-manager=cargo&previous-version=0.9.1&new-version=0.14.1)

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.