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

tokio: fix warnings in AS_FD_PROBE #5677

Merged
merged 1 commit into from May 9, 2023
Merged

Conversation

djc
Copy link
Contributor

@djc djc commented May 9, 2023

Motivation

The AsFd implementations did not actually appear when building with rustc 1.63. The previous state of the probe generated a warning which resulted in tokio_no_as_fd being generated:

[tokio 1.28.0] error[E0658]: attributes on expressions are experimental
[tokio 1.28.0]  --> <anon>:3:5
[tokio 1.28.0]   |
[tokio 1.28.0] 3 |     #![allow(unused_imports)]
[tokio 1.28.0]   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
[tokio 1.28.0]   |
[tokio 1.28.0]   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
[tokio 1.28.0] 
[tokio 1.28.0] error: aborting due to previous error
[tokio 1.28.0] 
[tokio 1.28.0] For more information about this error, try `rustc --explain E0658`.
[tokio 1.28.0] cargo:rustc-cfg=tokio_no_as_fd

Solution

Instead, add the allow to each import separately.

Tested this locally with rust 1.63 and it seemed to have the desired effect.

@djc djc requested review from sfackler and taiki-e May 9, 2023 15:05
@Darksonn Darksonn added the A-tokio Area: The main tokio crate label May 9, 2023
tokio/build.rs Show resolved Hide resolved
@djc djc changed the base branch from master to tokio-1.28.x May 9, 2023 15:19
tokio/build.rs Outdated Show resolved Hide resolved
Copy link
Member

@taiki-e taiki-e left a comment

Choose a reason for hiding this comment

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

Thanks!

@Darksonn Darksonn merged commit f2d033e into tokio-1.28.x May 9, 2023
47 checks passed
@Darksonn Darksonn deleted the fix-as-fd-probe branch May 9, 2023 19:57
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request May 21, 2023
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dependencies | patch | `1.28.0` -> `1.28.1` |
| [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dev-dependencies | patch | `1.28.0` -> `1.28.1` |

---

### Release Notes

<details>
<summary>tokio-rs/tokio</summary>

### [`v1.28.1`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.28.1): Tokio v1.28.1

[Compare Source](tokio-rs/tokio@tokio-1.28.0...tokio-1.28.1)

##### 1.28.1 (May 10th, 2023)

This release fixes a mistake in the build script that makes `AsFd` implementations unavailable on Rust 1.63. ([#&#8203;5677])

[#&#8203;5677]: tokio-rs/tokio#5677

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS45Ni4yIiwidXBkYXRlZEluVmVyIjoiMzUuOTYuMiIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AifQ==-->

Co-authored-by: cabr2-bot <cabr2.help@gmail.com>
Co-authored-by: crapStone <crapstone@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1897
Reviewed-by: crapStone <crapstone@noreply.codeberg.org>
Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-tokio Area: The main tokio crate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants