Skip to content

Commit dbb3887

Browse files
authored
Merge branch 'rust-lang:master' into display-errors-instead-of-logging
2 parents 48236fb + b3b4388 commit dbb3887

Some content is hidden

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

43 files changed

+1345
-1747
lines changed

.env.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export DOCSRS_PREFIX=ignored/cratesfyi-prefix
22
export DOCSRS_DATABASE_URL=postgresql://cratesfyi:password@localhost:15432
33

44
# for local development with sqlx
5-
export DATABASE_URL="$DOCSRS_DATABASE_URL"
5+
export DATABASE_URL=postgresql://cratesfyi:password@localhost:15432
66

77
export DOCSRS_LOG=docs_rs=debug,rustwide=info
88
# To build with a PR that hasn't landed in a rust dist toolchain yet,

.github/workflows/ci.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@v4
2929

30+
- name: update rust toolchain
31+
run: |
32+
rustup override set stable
33+
rustup update stable
34+
3035
- name: install `just`
3136
run: sudo snap install --edge --classic just
3237

@@ -71,6 +76,11 @@ jobs:
7176
steps:
7277
- uses: actions/checkout@v4
7378

79+
- name: update rust toolchain
80+
run: |
81+
rustup override set stable
82+
rustup update stable
83+
7484
- name: restore build & cargo cache
7585
uses: Swatinem/rust-cache@v2
7686
with:
@@ -107,6 +117,11 @@ jobs:
107117
steps:
108118
- uses: actions/checkout@v4
109119

120+
- name: update rust toolchain
121+
run: |
122+
rustup override set stable
123+
rustup update stable
124+
110125
- name: restore build & cargo cache
111126
uses: Swatinem/rust-cache@v2
112127
with:
@@ -134,8 +149,11 @@ jobs:
134149

135150
steps:
136151
- uses: actions/checkout@v4
137-
- id: install
138-
run: rustup component add rustfmt
152+
- name: update rust toolchain
153+
run: |
154+
rustup override set stable
155+
rustup update stable
156+
rustup component add rustfmt
139157
140158
- run: cargo fmt -- --check
141159

@@ -145,8 +163,12 @@ jobs:
145163

146164
steps:
147165
- uses: actions/checkout@v4
148-
- id: install
149-
run: rustup component add clippy
166+
167+
- name: update rust toolchain
168+
run: |
169+
rustup override set stable
170+
rustup update stable
171+
rustup component add clippy
150172
151173
- name: install `just`
152174
run: sudo snap install --edge --classic just

.sqlx/query-43d0bb3b88356af3abdae506b7699ec762a6f1debbbda49a3479fddaa8917e17.json renamed to .sqlx/query-4242ea977833de52a1b11e1bf418750e53a36222d36ab26140a7692e200fd35b.json

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.sqlx/query-ebb47544b1090567139f3bdf2c22993c3a3aaef41c6520095a2c3bfaf6035da6.json renamed to .sqlx/query-9633480047fdf3519d16bc5b4035b2e2d0e4403aa54c5cefbd64188ba3b41132.json

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)