Skip to content

Commit c7b5bc9

Browse files
Update derive_more requirement from 1 to 2 (#19671)
Updates the requirements on [derive_more](https://github.com/JelteF/derive_more) to permit the latest version. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/JelteF/derive_more/releases">derive_more's releases</a>.</em></p> <blockquote> <h2>2.0.1</h2> <p><a href="https://docs.rs/derive_more/2.0.1">API docs</a> <a href="https://github.com/JelteF/derive_more/blob/v2.0.1/CHANGELOG.md#201---2025-02-03">Changelog</a></p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/JelteF/derive_more/blob/master/CHANGELOG.md">derive_more's changelog</a>.</em></p> <blockquote> <h2>2.0.1 - 2025-02-03</h2> <h3>Added</h3> <ul> <li>Add crate metadata for the Rust Playground. This makes sure that the Rust Playground will have all <code>derive_more</code> features available once <a href="https://docs.rs/selectors/latest/selectors"><code>selectors</code></a> crate updates its <code>derive_more</code> version. (<a href="https://redirect.github.com/JelteF/derive_more/pull/445">#445</a>)</li> </ul> <h2>2.0.0 - 2025-02-03</h2> <h3>Breaking changes</h3> <ul> <li><code>use derive_more::SomeTrait</code> now imports macro only. Importing macro with its trait along is possible now via <code>use derive_more::with_trait::SomeTrait</code>. (<a href="https://redirect.github.com/JelteF/derive_more/pull/406">#406</a>)</li> <li>Top-level <code>#[display(&quot;...&quot;)]</code> attribute on an enum now has defaulting behavior instead of replacing when no wrapping is possible (no <code>_variant</code> placeholder). (<a href="https://redirect.github.com/JelteF/derive_more/pull/395">#395</a>)</li> </ul> <h3>Fixed</h3> <ul> <li>Associated types of type parameters not being treated as generics in <code>Debug</code> and <code>Display</code> expansions. (<a href="https://redirect.github.com/JelteF/derive_more/pull/399">#399</a>)</li> <li><code>unreachable_code</code> warnings on generated code when <code>!</code> (never type) is used. (<a href="https://redirect.github.com/JelteF/derive_more/pull/404">#404</a>)</li> <li>Ambiguous associated item error when deriving <code>TryFrom</code>, <code>TryInto</code> or <code>FromStr</code> with an associated item called <code>Error</code> or <code>Err</code> respectively. (<a href="https://redirect.github.com/JelteF/derive_more/pull/410">#410</a>)</li> <li>Top-level <code>#[display(&quot;...&quot;)]</code> attribute on an enum being incorrectly treated as transparent or wrapping. (<a href="https://redirect.github.com/JelteF/derive_more/pull/395">#395</a>)</li> <li>Omitted raw identifiers in <code>Debug</code> and <code>Display</code> expansions. (<a href="https://redirect.github.com/JelteF/derive_more/pull/431">#431</a>)</li> <li>Incorrect rendering of raw identifiers as field names in <code>Debug</code> expansions. (<a href="https://redirect.github.com/JelteF/derive_more/pull/431">#431</a>)</li> <li>Top-level <code>#[display(&quot;...&quot;)]</code> attribute on an enum not working transparently for directly specified fields. (<a href="https://redirect.github.com/JelteF/derive_more/pull/438">#438</a>)</li> <li>Incorrect dereferencing of unsized fields in <code>Debug</code> and <code>Display</code> expansions. (<a href="https://redirect.github.com/JelteF/derive_more/pull/440">#440</a>)</li> </ul> <h2>0.99.19 - 2025-02-03</h2> <ul> <li>Add crate metadata for the Rust Playground.</li> </ul> <h2>1.0.0 - 2024-08-07</h2> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/JelteF/derive_more/commit/a78d8ee41dc4c5fd73572b65dee4cc1369a4c6f1"><code>a78d8ee</code></a> chore: Release</li> <li><a href="https://github.com/JelteF/derive_more/commit/2aeee4d1c0de55b6b42348eab3e016cdfab679a7"><code>2aeee4d</code></a> Update changelog (<a href="https://redirect.github.com/JelteF/derive_more/issues/446">#446</a>)</li> <li><a href="https://github.com/JelteF/derive_more/commit/5afbaa1d8e776ba86b8341b19519720ddee0e50c"><code>5afbaa1</code></a> Add Rust Playground metadata (<a href="https://redirect.github.com/JelteF/derive_more/issues/445">#445</a>)</li> <li><a href="https://github.com/JelteF/derive_more/commit/d6c3315f12bc88468c1d463a37581163dbfdaea8"><code>d6c3315</code></a> Prepare 2.0.0 release (<a href="https://redirect.github.com/JelteF/derive_more/issues/444">#444</a>)</li> <li><a href="https://github.com/JelteF/derive_more/commit/c5e5e82c0ade464539c21b055bd26378579e26e8"><code>c5e5e82</code></a> Fix unsized fields usage in <code>Display</code>/<code>Debug</code> derives (<a href="https://redirect.github.com/JelteF/derive_more/issues/440">#440</a>, <a href="https://redirect.github.com/JelteF/derive_more/issues/432">#432</a>)</li> <li><a href="https://github.com/JelteF/derive_more/commit/d391493a3c9645c1bc1e139779f8631c48b67d1d"><code>d391493</code></a> Fix field transparency for top-level shared attribute in <code>Display</code> (<a href="https://redirect.github.com/JelteF/derive_more/issues/438">#438</a>)</li> <li><a href="https://github.com/JelteF/derive_more/commit/f14c7a759af6d0a9a12f36227e3ce21d2c4f406a"><code>f14c7a7</code></a> Fix raw identifiers usage in <code>Display</code>/<code>Debug</code> derives (<a href="https://redirect.github.com/JelteF/derive_more/issues/434">#434</a>, <a href="https://redirect.github.com/JelteF/derive_more/issues/431">#431</a>)</li> <li><a href="https://github.com/JelteF/derive_more/commit/7b23de3d53616deec91cd507a0afd19b7634e426"><code>7b23de3</code></a> Update <code>convert_case</code> crate from 0.6 to 0.7 version (<a href="https://redirect.github.com/JelteF/derive_more/issues/436">#436</a>)</li> <li><a href="https://github.com/JelteF/derive_more/commit/cc9957e9cdacb1617547f3b55bac885202284291"><code>cc9957e</code></a> Fix <code>compile_fail</code> tests and make Clippy happy for 1.84 Rust (<a href="https://redirect.github.com/JelteF/derive_more/issues/435">#435</a>)</li> <li><a href="https://github.com/JelteF/derive_more/commit/17d61c31188bbeb1dc7269246b4179d5dace1375"><code>17d61c3</code></a> Fix transparency and behavior of shared formatting on enums (<a href="https://redirect.github.com/JelteF/derive_more/issues/395">#395</a>, <a href="https://redirect.github.com/JelteF/derive_more/issues/377">#377</a>, <a href="https://redirect.github.com/JelteF/derive_more/issues/411">#411</a>)</li> <li>Additional commits viewable in <a href="https://github.com/JelteF/derive_more/compare/v1.0.0...v2.0.1">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 show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@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> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 86f00e8 commit c7b5bc9

File tree

15 files changed

+15
-15
lines changed

15 files changed

+15
-15
lines changed

crates/bevy_animation/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ serde = "1"
3737
blake3 = { version = "1.0" }
3838
downcast-rs = { version = "2", default-features = false, features = ["std"] }
3939
thiserror = { version = "2", default-features = false }
40-
derive_more = { version = "1", default-features = false, features = ["from"] }
40+
derive_more = { version = "2", default-features = false, features = ["from"] }
4141
either = "1.13"
4242
thread_local = "1"
4343
uuid = { version = "1.13.1", features = ["v4"] }

crates/bevy_asset/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ parking_lot = { version = "0.12", default-features = false, features = [
5757
ron = { version = "0.10", default-features = false }
5858
serde = { version = "1", default-features = false, features = ["derive"] }
5959
thiserror = { version = "2", default-features = false }
60-
derive_more = { version = "1", default-features = false, features = ["from"] }
60+
derive_more = { version = "2", default-features = false, features = ["from"] }
6161
uuid = { version = "1.13.1", default-features = false, features = [
6262
"v4",
6363
"serde",

crates/bevy_color/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ serde = { version = "1.0", features = [
1919
"derive",
2020
], default-features = false, optional = true }
2121
thiserror = { version = "2", default-features = false }
22-
derive_more = { version = "1", default-features = false, features = ["from"] }
22+
derive_more = { version = "2", default-features = false, features = ["from"] }
2323
wgpu-types = { version = "24", default-features = false, optional = true }
2424
encase = { version = "0.10", default-features = false, optional = true }
2525

crates/bevy_ecs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ serde = { version = "1", default-features = false, features = [
104104
"serde_derive",
105105
], optional = true }
106106
thiserror = { version = "2", default-features = false }
107-
derive_more = { version = "1", default-features = false, features = [
107+
derive_more = { version = "2", default-features = false, features = [
108108
"from",
109109
"display",
110110
"into",

crates/bevy_input/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ serde = { version = "1", features = [
7575
"derive",
7676
], default-features = false, optional = true }
7777
thiserror = { version = "2", default-features = false }
78-
derive_more = { version = "1", default-features = false, features = ["from"] }
78+
derive_more = { version = "2", default-features = false, features = ["from"] }
7979
smol_str = { version = "0.2", default-features = false, optional = true }
8080
log = { version = "0.4", default-features = false }
8181

crates/bevy_math/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ rust-version = "1.85.0"
1212
[dependencies]
1313
glam = { version = "0.29.3", default-features = false, features = ["bytemuck"] }
1414
thiserror = { version = "2", default-features = false }
15-
derive_more = { version = "1", default-features = false, features = [
15+
derive_more = { version = "2", default-features = false, features = [
1616
"from",
1717
"into",
1818
] }

crates/bevy_pbr/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev", default-fea
5454
bitflags = "2.3"
5555
fixedbitset = "0.5"
5656
thiserror = { version = "2", default-features = false }
57-
derive_more = { version = "1", default-features = false, features = ["from"] }
57+
derive_more = { version = "2", default-features = false, features = ["from"] }
5858
# meshlet
5959
lz4_flex = { version = "0.11", default-features = false, features = [
6060
"frame",

crates/bevy_reflect/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ erased-serde = { version = "0.4", default-features = false, features = [
9393
disqualified = { version = "1.0", default-features = false }
9494
downcast-rs = { version = "2", default-features = false }
9595
thiserror = { version = "2", default-features = false }
96-
derive_more = { version = "1", default-features = false, features = ["from"] }
96+
derive_more = { version = "2", default-features = false, features = ["from"] }
9797
serde = { version = "1", default-features = false, features = ["alloc"] }
9898
assert_type_match = "0.1.1"
9999
smallvec = { version = "1.11", default-features = false, optional = true }

crates/bevy_render/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ serde = { version = "1", features = ["derive"] }
102102
bytemuck = { version = "1.5", features = ["derive", "must_cast"] }
103103
downcast-rs = { version = "2", default-features = false, features = ["std"] }
104104
thiserror = { version = "2", default-features = false }
105-
derive_more = { version = "1", default-features = false, features = ["from"] }
105+
derive_more = { version = "2", default-features = false, features = ["from"] }
106106
futures-lite = "2.0.1"
107107
encase = { version = "0.10", features = ["glam"] }
108108
# For wgpu profiling using tracing. Use `RUST_LOG=info` to also capture the wgpu spans.

crates/bevy_scene/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev", default-fea
3636
serde = { version = "1.0", features = ["derive"], optional = true }
3737
uuid = { version = "1.13.1", features = ["v4"] }
3838
thiserror = { version = "2", default-features = false }
39-
derive_more = { version = "1", default-features = false, features = ["from"] }
39+
derive_more = { version = "2", default-features = false, features = ["from"] }
4040

4141
[target.'cfg(target_arch = "wasm32")'.dependencies]
4242
# TODO: Assuming all wasm builds are for the browser. Require `no_std` support to break assumption.

0 commit comments

Comments
 (0)