Skip to content

Commit 3805ea6

Browse files
bors[bot]dependabot[bot]Bromeon
authored
Merge #1046
1046: Update glam requirement from 0.23 to 0.24 r=chitoyuu a=dependabot[bot] Updates the requirements on [glam](https://github.com/bitshifter/glam-rs) to permit the latest version. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/bitshifter/glam-rs/blob/main/CHANGELOG.md">glam's changelog</a>.</em></p> <blockquote> <h2>[0.24.0] - 2023-04-24</h2> <h3>Breaking changes</h3> <ul> <li>Enabling <code>libm</code> in a <code>std</code> build now overrides the <code>std</code> math functions. This is unlikely to break anything but it is a change in behaviour.</li> </ul> <h3>Added</h3> <ul> <li> <p>Added <code>i64</code> and <code>u64</code> vector types; <code>I64Vec2</code>, <code>I64Vec3</code>, <code>I64Vec4</code>, <code>U64Vec2</code>, <code>U64Vec3</code> and <code>U64Vec4</code>.</p> </li> <li> <p>Added <code>length_squared</code> method on signed and unsigned integer vector types.</p> </li> <li> <p>Added <code>distance_squared</code> method on signed integer vector types.</p> </li> <li> <p>Implemented the <code>bytemuck</code> <code>AnyBitPattern</code> trait on <code>Vec3A</code>, <code>Mat3A</code> and <code>Affine3A</code>.</p> </li> </ul> <h3>Changed</h3> <ul> <li>Changed quaternion <code>to_axis_angle</code> for improved numerical stability.</li> </ul> <h3>Removed</h3> <ul> <li>Removed dependency on <code>serde_derive</code> for improved compile times when using <code>serde</code>.</li> </ul> <h2>[0.23.0] - 2023-02-22</h2> <h3>Breaking changes</h3> <ul> <li>When the <code>scalar-math</code> feature is enabled the vector mask type for <code>Vec3A</code> was changed from <code>BVec3</code> to <code>BVec3A</code>.</li> </ul> <h3>Added</h3> <ul> <li>Added <code>copysign</code> method to signed vector types.</li> </ul> <h2>[0.22.0] - 2022-10-24</h2> <h3>Breaking changes</h3> <ul> <li> <p>Added <code>u32</code> implementation of <code>BVec3A</code> and <code>BVec4</code> when SIMD is not available. These are used instead of aliasing to the <code>bool</code> implementations.</p> </li> <li> <p>Removed <code>Add</code>, <code>Sub</code>, and scalar <code>Mul</code> implementations from affine types as they didn't make sense on these types.</p> </li> <li> <p>Removed deprecated <code>const_*</code> macros. These have been replaced by <code>const fn</code></p> </li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/bitshifter/glam-rs/commit/249023c06db3796aebba0c75143e042043e2a5c2"><code>249023c</code></a> Prepare for 0.24.0 release. (<a href="https://redirect.github.com/bitshifter/glam-rs/issues/395">#395</a>)</li> <li><a href="https://github.com/bitshifter/glam-rs/commit/722956355bb66bd68e81245c64fdacefe5bbf79c"><code>7229563</code></a> Fix typo: <code>Othographic</code> -&gt; <code>Orthographic</code> (<a href="https://redirect.github.com/bitshifter/glam-rs/issues/394">#394</a>)</li> <li><a href="https://github.com/bitshifter/glam-rs/commit/063b327ab69225e263b35efb6a4fcd04cd080489"><code>063b327</code></a> Remove legacy <code>::from()</code> truncation mention in docs; add more intradoc links ...</li> <li><a href="https://github.com/bitshifter/glam-rs/commit/c40e6586f427236719fa5fed33e30624f036d4fa"><code>c40e658</code></a> CI: Build-test documentation (<a href="https://redirect.github.com/bitshifter/glam-rs/issues/393">#393</a>)</li> <li><a href="https://github.com/bitshifter/glam-rs/commit/6ca6f2e9c9623adb89f9cd5dca210c971732629e"><code>6ca6f2e</code></a> Add bytemuck <code>AnyBitPattern</code> support for <code>Vec3A</code>, <code>Mat3A</code> and <code>Affine3A</code>.</li> <li><a href="https://github.com/bitshifter/glam-rs/commit/a881b741e521d199c8ccb79ba347285527eff41c"><code>a881b74</code></a> Make enabling libm override std math functions (<a href="https://redirect.github.com/bitshifter/glam-rs/issues/389">#389</a>)</li> <li><a href="https://github.com/bitshifter/glam-rs/commit/fa730f02ae0c69b0c9e02817920876bc2b389811"><code>fa730f0</code></a> Updated changelog.</li> <li><a href="https://github.com/bitshifter/glam-rs/commit/e233f794f82e5769255b22fc2a6361e670d877df"><code>e233f79</code></a> remove <code>serde_derive</code> (<a href="https://redirect.github.com/bitshifter/glam-rs/issues/385">#385</a>)</li> <li><a href="https://github.com/bitshifter/glam-rs/commit/2b187c2f1df22c8d61d3468f8b02abec6bd78993"><code>2b187c2</code></a> Calculate Quat::to_axis_angle in a more numerically stable way (<a href="https://redirect.github.com/bitshifter/glam-rs/issues/387">#387</a>)</li> <li><a href="https://github.com/bitshifter/glam-rs/commit/38345b94ddd8c443b8a2d638b9a69d6ed1e45abd"><code>38345b9</code></a> Support length_squared and distance_squared on int vectors. (<a href="https://redirect.github.com/bitshifter/glam-rs/issues/382">#382</a>)</li> <li>Additional commits viewable in <a href="https://github.com/bitshifter/glam-rs/compare/0.23.0...0.24.0">compare view</a></li> </ul> </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) </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jan Haller <bromeon@gmail.com>
2 parents 50237dc + 6da8cdc commit 3805ea6

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

gdnative-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ahash = "0.8"
2525
approx = "0.5"
2626
atomic-take = "1"
2727
bitflags = "1"
28-
glam = "0.23"
28+
glam = "0.24"
2929
indexmap = "1"
3030
inventory = { version = "0.3", optional = true }
3131
libc = "0.2"
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
error: cannot find attribute `method` in this scope
2-
--> tests/ui/derive_fail_methods.rs:12:7
3-
|
4-
12 | #[method]
5-
| ^^^^^^ help: an attribute macro with a similar name exists: `methods`
6-
|
7-
::: $WORKSPACE/gdnative-derive/src/lib.rs
8-
|
9-
| pub fn methods(meta: TokenStream, input: TokenStream) -> TokenStream {
10-
| -------------------------------------------------------------------- similarly named attribute macro `methods` defined here
2+
--> tests/ui/derive_fail_methods.rs:12:7
3+
|
4+
12 | #[method]
5+
| ^^^^^^ help: an attribute macro with a similar name exists: `methods`
6+
|
7+
::: $WORKSPACE/gdnative-derive/src/lib.rs
8+
|
9+
| pub fn methods(meta: TokenStream, input: TokenStream) -> TokenStream {
10+
| -------------------------------------------------------------------- similarly named attribute macro `methods` defined here

gdnative/tests/ui/derive_fail_property_hint.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ error[E0271]: type mismatch resolving `<String as Export>::Hint == ()`
22
--> $DIR/derive_fail_property_hint.rs:5:19
33
|
44
5 | #[derive(Default, NativeClass)]
5-
| ^^^^^^^^^^^ expected enum `StringHint`, found `()`
5+
| ^^^^^^^^^^^ expected `StringHint`, found `()`
66
|
77
= note: this error originates in the derive macro `NativeClass` (in Nightly builds, run with -Z macro-backtrace for more info)

0 commit comments

Comments
 (0)