Skip to content

Commit a759d5f

Browse files
committed
Update to Rocket 0.5
We are considering ditching Rocket for axum, but, in the meantime, let's at the very least update to the latest Rocket version so that: * we can fix all the security vulnerabilities Dependabot is complaining about * we can use stable Rust instead of nightly There are many backward incompatible changes, but most were due to async and new lifetimes sprinkled everywhere now. One annoying bit is that we have to temporarily give up on our tracing integration: request span can no longer be created on the same thread as Tokio can move futures between threads, and the span must be created on the top-level "request" future, i.e. in Rocket itself. The code compiles, but it is disabled.
1 parent 1de868b commit a759d5f

File tree

15 files changed

+713
-895
lines changed

15 files changed

+713
-895
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ jobs:
5252
- ubuntu-latest
5353
- windows-latest
5454
- macos-latest
55-
rust-version:
56-
- nightly
5755

5856
runs-on: ${{ matrix.os }}
5957

@@ -63,7 +61,7 @@ jobs:
6361
- uses: actions-rs/toolchain@v1
6462
with:
6563
profile: minimal
66-
toolchain: ${{ matrix.rust-version }}
64+
toolchain: stable
6765
override: true
6866

6967
- name: Setup PostgreSQL

.github/workflows/tests.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
- uses: actions-rs/toolchain@v1
4242
with:
43-
toolchain: nightly
43+
toolchain: stable
4444
profile: minimal
4545
components: clippy
4646
override: true
@@ -57,8 +57,6 @@ jobs:
5757
- ubuntu-latest
5858
- windows-latest
5959
- macos-latest
60-
rust-version:
61-
- nightly
6260

6361
runs-on: ${{ matrix.os }}
6462

@@ -68,7 +66,7 @@ jobs:
6866
- uses: actions-rs/toolchain@v1
6967
with:
7068
profile: minimal
71-
toolchain: ${{ matrix.rust-version }}
69+
toolchain: stable
7270
override: true
7371

7472
- name: Setup PostgreSQL
@@ -99,7 +97,7 @@ jobs:
9997

10098
- uses: actions-rs/toolchain@v1
10199
with:
102-
toolchain: nightly
100+
toolchain: stable
103101
profile: minimal
104102
override: true
105103

@@ -116,7 +114,7 @@ jobs:
116114
- uses: actions-rs/toolchain@v1
117115
with:
118116
profile: minimal
119-
toolchain: nightly
117+
toolchain: stable
120118
override: true
121119

122120
- name: Setup PostgreSQL

.rustfmt.toml

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)