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

Fix beta CI #12913

Merged
merged 2 commits into from
Apr 9, 2024
Merged

Fix beta CI #12913

merged 2 commits into from
Apr 9, 2024

Conversation

BD103
Copy link
Member

@BD103 BD103 commented Apr 9, 2024

Objective

Solution

  • Use proper code `` tags for TaskPoolBuilder::thread_name.
  • Remove leftover documentation in TaskPool referencing the deleted TaskPoolInner struct.
    • It may be possible to rephrase this, but I do not know enough about the task pool to write something. (cc @james7132 who made the change removing TaskPoolInner.)
  • Ignore a buggy rustdoc lint that thinks App is already in scope for UpdateMode doc. (Extracted from Use same docs, for CI and deployment #12692.)

I chose to remove the extended documentation for `TaskPool::executor`. It references `TaskPoolInner` which was added in bevyengine#384 when `bevy_tasks` was first created, but that struct was later removed in bevyengine#2250. James may be able to rewrite the comment, but I do not know enough about the task pool to write anything.
@BD103 BD103 added C-Bug An unexpected or incorrect behavior A-Windowing Platform-agnostic interface layer to run your app in A-Tasks Tools for parallel and async work labels Apr 9, 2024
@BD103
Copy link
Member Author

BD103 commented Apr 9, 2024

cc @Brezak :)

@mockersf
Copy link
Member

mockersf commented Apr 9, 2024

a buggy rustdoc lint

Do you know if that's tracked on rust side?

@BD103
Copy link
Member Author

BD103 commented Apr 9, 2024

a buggy rustdoc lint

Do you know if that's tracked on rust side?

I've created rust-lang/rust#123677!

@BD103 BD103 added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Apr 9, 2024
@james7132 james7132 added this pull request to the merge queue Apr 9, 2024
Merged via the queue into bevyengine:main with commit a9943e8 Apr 9, 2024
32 checks passed
@BD103 BD103 deleted the fix-beta branch April 9, 2024 19:19
github-merge-queue bot pushed a commit that referenced this pull request Apr 22, 2024
# Objective

- rust-lang/rust#123905 has been merged, so the
workaround introduced in #12913 is no longer necessary.
- Closes #12968

## Solution

- Remove unecessary `allow` attribute
  - This is currently blocked until Rust beta updates.
  - Last tested with `rustc 1.78.0-beta.7 (6fd191292 2024-04-12)`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Tasks Tools for parallel and async work A-Windowing Platform-agnostic interface layer to run your app in C-Bug An unexpected or incorrect behavior S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Main branch fails to compile on Rust beta.
4 participants