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

chore: fix version detection in build script #4860

Merged
merged 3 commits into from
Jul 25, 2022
Merged

Conversation

Darksonn
Copy link
Contributor

@Darksonn Darksonn commented Jul 25, 2022

Currently, Tokio does not compile on some nightly releases such as 2021-12-05. This is due to how our version detection is implemented. This PR fixes that.

Additionally, the cfg flag is inverted. The motivation for doing this is that it makes it possible to disable the feature by passing RUSTFLAGS="--cfg tokio_no_const_thread_local" even if you are using a compiler that supports it.

This PR replaces #4859

@Darksonn Darksonn added the A-tokio Area: The main tokio crate label Jul 25, 2022
@Darksonn Darksonn merged commit b673eae into tokio-1.20.x Jul 25, 2022
@Darksonn Darksonn deleted the fix-build-script branch July 25, 2022 12:14
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Jul 31, 2022
This PR contains the following updates:

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

---

### Release Notes

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

### [`v1.20.1`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.20.1)

[Compare Source](tokio-rs/tokio@tokio-1.20.0...tokio-1.20.1)

##### 1.20.1 (July 25, 2022)

##### Fixed

-   chore: fix version detection in build script ([#&#8203;4860])

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

</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, click this checkbox.

---

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

Co-authored-by: cabr2-bot <cabr2.help@gmail.com>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1478
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>
kodiakhq bot pushed a commit to pdylanross/fatigue that referenced this pull request Aug 23, 2023
Bumps tokio from 1.16.1 to 1.20.5.

Release notes
Sourced from tokio's releases.

Tokio v1.20.5
1.20.5 (May 28, 2023)
Forward ports 1.18.6 changes.
Fixed

deps: disable default features for mio (#5728)

#5728: tokio-rs/tokio#5728
Tokio v1.20.2
1.20.2 (September 27, 2022)
This release removes the dependency on the once_cell crate to restore the MSRV of the 1.20.x LTS release. (#5048)
#5048: tokio-rs/tokio#5048
Tokio v1.20.1
1.20.1 (July 25, 2022)
Fixed

chore: fix version detection in build script (#4860)

#4860: tokio-rs/tokio#4860
Tokio v1.20.0
1.20.0 (July 12, 2022)
Added

tokio: add track_caller to public APIs (#4772, #4791, #4793, #4806, #4808)
sync: Add has_changed method to watch::Ref (#4758)

Changed

time: remove src/time/driver/wheel/stack.rs (#4766)
rt: clean up arguments passed to basic scheduler (#4767)
net: be more specific about winapi features (#4764)
tokio: use const initialized thread locals where possible (#4677)
task: various small improvements to LocalKey (#4795)

Fixed
Documented

fs: warn about performance pitfall (#4762)
chore: fix spelling (#4769)
sync: document spurious failures in oneshot (#4777)
sync: add warning for watch in non-Send futures (#4741)
chore: fix typo (#4798)



... (truncated)


Commits

edd172c chore: prepare Tokio v1.20.5 (#5731)
9877fa2 Merge 'tokio-1.18.6' into 'tokio-1.20.x' (#5730)
0f898a3 chore: prepare Tokio v1.18.6 (#5729)
d6a9ef5 tokio: disable default features for mio (#5728)
2a18018 ci: fix CI for 1.18.x branch (#5728)
f3ce29a chore: prepare Tokio v1.20.4 release
0d8fe5f Merge branch 'tokio-1.18.x' into tokio-1.20.x
171ce0f chore: prepare Tokio v1.18.5 release
d6ea7a7 Add T: Unpin bound to ReadHalf::unsplit
ba81945 chore: prepare Tokio 1.20.3 release
Additional commits viewable in compare view




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 commands and options

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)
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.

2 participants