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.

Sign up for GitHub

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

Jump to bottom

Remove dependency on mopa crate #631

Merged
merged 1 commit into from
Aug 26, 2019
Merged

Remove dependency on mopa crate #631

merged 1 commit into from
Aug 26, 2019

Conversation

willglynn
Copy link
Contributor

mopa::Any is less necessary with changes to std::any::Any, and specs wasn't calling the mopafy!() macro for Component anyway.

Checklist

  • n/a I've added tests for all code changes and additions (where applicable)
  • n/a I've added a demonstration of the new feature to one or more examples
  • n/a I've updated the book to reflect my changes
  • n/a Usage of new public items is shown in the API docs

Nothing in the specs repo except the Component definition and an associated generic type in a test refer to Any, and even then only in type bounds. No tests or examples are affected.

API changes

This change breaks any code which specifically needs trait Component: mopa::Any, but as far as I can tell that doesn't work now and hasn't since ±ever since specs doesn't call the mopafy!() macro.

@willglynn
Remove dependency on mopa crate
caa292d 
mopa::Any is less necessary with changes to std::any::Any, and
specs wasn't calling the mopafy!() macro for Component anyway.
torkleyy
torkleyy approved these changes Aug 26, 2019
View reviewed changes
Copy link
Member

@torkleyy torkleyy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, indeed, there's no need for mopa here at all. Components are never used as trait objects, and as you said, mopafy wasn't even called.

bors r+

bors bot added a commit that referenced this pull request Aug 26, 2019
@bors @dependabot-preview @willglynn
Merge #627 #631
b938efc 
627: Update hashbrown requirement from 0.5.0 to 0.6.0 r=torkleyy a=dependabot-preview[bot]

Updates the requirements on [hashbrown](https://github.com/rust-lang/hashbrown) to permit the latest version.
<details>
<summary>Changelog</summary>

*Sourced from [hashbrown's changelog](https://github.com/rust-lang/hashbrown/blob/master/CHANGELOG.md).*

> ## [v0.6.0] - 2019-08-13
> 
> ### Fixed
> - Fixed AHash accidentally depending on `std`. ([#110](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/110))
> 
> ### Changed
> - The minimum Rust version has been bumped to 1.32 (due to `rand` dependency).
> 
> ## ~~[v0.5.1] - 2019-08-04~~
> 
> This release was _yanked_ due to a breaking change for users of `no-default-features`.
> 
> ### Added
> - The experimental and unsafe `RawTable` API is available under the "raw" feature. ([#108](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/108))
> - Added entry-like methods for `HashSet`. ([#98](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/98))
> 
> ### Changed
> - Changed the default hasher from FxHash to AHash. ([#97](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/97))
> - `hashbrown` is now fully `no_std` on recent Rust versions (1.36+). ([#96](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/96))
> 
> ### Fixed
> - We now avoid growing the table during insertions when it wasn't necessary. ([#106](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/106))
> - `RawOccupiedEntryMut` now properly implements `Send` and `Sync`. ([#100](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/100))
> - Relaxed `lazy_static` version. ([#92](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/92))
> 
> ## [v0.5.0] - 2019-06-12
> 
> ### Fixed
> - Resize with a more conservative amount of space after deletions. ([#86](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/86))
> 
> ### Changed
> - Exposed the Layout of the failed allocation in CollectionAllocErr::AllocErr. ([#89](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/89))
> 
> ## [v0.4.0] - 2019-05-30
> 
> ### Fixed
> - Fixed `Send` trait bounds on `IterMut` not matching the libstd one. ([#82](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/82))
> 
> ## [v0.3.1] - 2019-05-30
> 
> ### Fixed
> - Fixed incorrect use of slice in unsafe code. ([#80](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/80))
> 
> ## [v0.3.0] - 2019-04-23
> 
> ### Changed
> - Changed shrink_to to not panic if min_capacity < capacity. ([#67](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/67))
> 
> ### Fixed
> - Worked around emscripten bug emscripten-core/emscripten-fastcomp#258. ([#66](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/66))
></tr></table> ... (truncated)
</details>
<details>
<summary>Commits</summary>

- [`0a62c3e`](rust-lang/hashbrown@0a62c3e) Version 0.6.0
- [`0c1209a`](rust-lang/hashbrown@0c1209a) Auto merge of [#110](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/110) - Amanieu:no_std_ci, r=Amanieu
- [`8ae33c9`](rust-lang/hashbrown@8ae33c9) Don't use cross for thumb target CI
- [`3239c2b`](rust-lang/hashbrown@3239c2b) Fix clippy warnings
- [`12c55b6`](rust-lang/hashbrown@12c55b6) Bump minimum Rust version to 1.32
- [`fb0a938`](rust-lang/hashbrown@fb0a938) Bump minimum ahash version to 0.2.11
- [`bacb169`](rust-lang/hashbrown@bacb169) Merge pull request [#111](https://github-redirect.dependabot.com/rust-lang/hashbrown/issues/111) from RalfJung/readme
- [`2921920`](rust-lang/hashbrown@2921920) when hashers with different design goals are compared, that should be noted
- [`aecb361`](rust-lang/hashbrown@aecb361) Check in CI that the crate builds on targets without libstd
- [`167eb54`](rust-lang/hashbrown@167eb54) Version 0.5.1
- Additional commits viewable in [compare view](rust-lang/hashbrown@v0.5.0...v0.6.0)
</details>
<br />

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)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- 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)

Finally, you can contact us by mentioning @dependabot.

</details>

631: Remove dependency on mopa crate r=torkleyy a=willglynn

`mopa::Any` is less necessary with changes to `std::any::Any`, and `specs` wasn't calling the `mopafy!()` macro for `Component` anyway.

## Checklist

* **n/a** I've added tests for all code changes and additions (where applicable)
* **n/a** I've added a demonstration of the new feature to one or more examples
* **n/a** I've updated the book to reflect my changes
* **n/a** Usage of new public items is shown in the API docs

Nothing in the `specs` repo except the `Component` definition and an associated generic type in a test refer to `Any`, and even then only in type bounds. No tests or examples are affected.

## API changes

This change breaks any code which specifically needs `trait Component: mopa::Any`, but as far as I can tell [that doesn't work now and hasn't since ±ever](#630 (comment)) since `specs` doesn't call the `mopafy!()` macro.

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Will Glynn <[email protected]>
@bors
Copy link
Contributor

bors bot commented Aug 26, 2019

Build succeeded

@bors bors bot merged commit caa292d into amethyst:master Aug 26, 2019
@willglynn willglynn deleted the remove_mopa branch August 26, 2019 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@torkleyy torkleyy torkleyy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@willglynn @torkleyy