Skip to content

Commit 458da24

Browse files
committed
Merge
1 parent 5e61c4f commit 458da24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1838
-1273
lines changed

.github/workflows/action-on-PR-labeled.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
BASE_SHA: ${{ github.event.pull_request.base.sha }}
3232
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
33-
- uses: actions/github-script@v7
33+
- uses: actions/github-script@v8
3434
if: steps.get_changes.outputs.found_changes == '0'
3535
with:
3636
script: |
@@ -60,7 +60,7 @@ jobs:
6060
env:
6161
BASE_SHA: ${{ github.event.pull_request.base.sha }}
6262
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
63-
- uses: actions/github-script@v7
63+
- uses: actions/github-script@v8
6464
if: steps.get_changes.outputs.found_changes == '0'
6565
with:
6666
script: |

.github/workflows/ci-comment-failures.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- name: 'Download artifact'
2525
id: find-artifact
26-
uses: actions/github-script@v7
26+
uses: actions/github-script@v8
2727
with:
2828
result-encoding: string
2929
script: |
@@ -63,7 +63,7 @@ jobs:
6363
fi
6464
- name: "Comment on PR"
6565
if: ${{ steps.find-artifact.outputs.result == 'true' && steps.check-last-comment.outputs.result == 'false' }}
66-
uses: actions/github-script@v7
66+
uses: actions/github-script@v8
6767
with:
6868
github-token: ${{ secrets.GITHUB_TOKEN }}
6969
script: |
@@ -94,7 +94,7 @@ jobs:
9494
steps:
9595
- name: 'Download artifact'
9696
id: find-artifact
97-
uses: actions/github-script@v7
97+
uses: actions/github-script@v8
9898
with:
9999
result-encoding: string
100100
script: |
@@ -134,7 +134,7 @@ jobs:
134134
fi
135135
- name: "Comment on PR"
136136
if: ${{ steps.find-artifact.outputs.result == 'true' && steps.check-last-comment.outputs.result == 'false' }}
137-
uses: actions/github-script@v7
137+
uses: actions/github-script@v8
138138
with:
139139
github-token: ${{ secrets.GITHUB_TOKEN }}
140140
script: |
@@ -165,7 +165,7 @@ jobs:
165165
steps:
166166
- name: 'Download artifact'
167167
id: find-artifact
168-
uses: actions/github-script@v7
168+
uses: actions/github-script@v8
169169
with:
170170
result-encoding: string
171171
script: |
@@ -205,7 +205,7 @@ jobs:
205205
fi
206206
- name: "Comment on PR"
207207
if: ${{ steps.find-artifact.outputs.result == 'true' && steps.check-last-comment.outputs.result == 'false' }}
208-
uses: actions/github-script@v7
208+
uses: actions/github-script@v8
209209
with:
210210
github-token: ${{ secrets.GITHUB_TOKEN }}
211211
script: |

.github/workflows/example-run-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- name: "Download artifact"
2727
id: find-artifact
28-
uses: actions/github-script@v7
28+
uses: actions/github-script@v8
2929
with:
3030
result-encoding: string
3131
script: |

.github/workflows/welcome.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
permissions:
1515
pull-requests: write
1616
steps:
17-
- uses: actions/github-script@v7
17+
- uses: actions/github-script@v8
1818
with:
1919
script: |
2020
// Get a list of all issues created by the PR opener

Cargo.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3877,6 +3877,15 @@ doc-scrape-examples = true
38773877
[package.metadata.example.minimizing]
38783878
hidden = true
38793879

3880+
[[example]]
3881+
name = "desktop_request_redraw"
3882+
path = "tests/window/desktop_request_redraw.rs"
3883+
doc-scrape-examples = true
3884+
required-features = ["bevy_dev_tools"]
3885+
3886+
[package.metadata.example.desktop_request_redraw]
3887+
hidden = true
3888+
38803889
[[example]]
38813890
name = "window_resizing"
38823891
path = "examples/window/window_resizing.rs"

crates/bevy_asset/src/event.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub enum AssetEvent<A: Asset> {
5454
Modified { id: AssetId<A> },
5555
/// Emitted whenever an [`Asset`] is removed.
5656
Removed { id: AssetId<A> },
57-
/// Emitted when the last [`super::Handle::Strong`] of an [`Asset`] is dropped.
57+
/// Emitted when the last [`Handle::Strong`](`super::Handle::Strong`) of an [`Asset`] is dropped.
5858
Unused { id: AssetId<A> },
5959
/// Emitted whenever an [`Asset`] has been fully loaded (including its dependencies and all "recursive dependencies").
6060
LoadedWithDependencies { id: AssetId<A> },

crates/bevy_camera/src/projection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ pub trait CameraProjection {
8181
mod sealed {
8282
use super::CameraProjection;
8383

84-
/// A wrapper trait to make it possible to implement Clone for boxed [`super::CameraProjection`]
84+
/// A wrapper trait to make it possible to implement Clone for boxed [`CameraProjection`][`super::CameraProjection`]
8585
/// trait objects, without breaking object safety rules by making it `Sized`. Additional bounds
8686
/// are included for downcasting, and fulfilling the trait bounds on `Projection`.
8787
pub trait DynCameraProjection:

crates/bevy_camera/src/visibility/range.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl VisibilityRange {
173173
/// Stores which entities are in within the [`VisibilityRange`]s of views.
174174
///
175175
/// This doesn't store the results of frustum or occlusion culling; use
176-
/// [`super::ViewVisibility`] for that. Thus entities in this list may not
176+
/// [`ViewVisibility`](`super::ViewVisibility`) for that. Thus entities in this list may not
177177
/// actually be visible.
178178
///
179179
/// For efficiency, these tables only store entities that have

crates/bevy_diagnostic/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev", default-fea
6060
] }
6161

6262
# other
63+
atomic-waker = { version = "1", default-features = false }
6364
const-fnv1a-hash = "1.1.0"
6465
serde = { version = "1.0", default-features = false, features = [
6566
"alloc",

crates/bevy_diagnostic/src/diagnostic.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ impl DiagnosticPath {
3939
pub fn new(path: impl Into<Cow<'static, str>>) -> DiagnosticPath {
4040
let path = path.into();
4141

42-
debug_assert!(!path.is_empty(), "diagnostic path can't be empty");
42+
debug_assert!(!path.is_empty(), "diagnostic path should not be empty");
4343
debug_assert!(
4444
!path.starts_with('/'),
45-
"diagnostic path can't be start with `/`"
45+
"diagnostic path should not start with `/`"
4646
);
4747
debug_assert!(
4848
!path.ends_with('/'),
49-
"diagnostic path can't be end with `/`"
49+
"diagnostic path should not end with `/`"
5050
);
5151
debug_assert!(
5252
!path.contains("//"),
53-
"diagnostic path can't contain empty components"
53+
"diagnostic path should not contain empty components"
5454
);
5555

5656
DiagnosticPath {

0 commit comments

Comments
 (0)