Skip to content

Commit dc4ddbf

Browse files
authored
Merge branch 'rust-lang:master' into docs
2 parents 8dc9e07 + b54e2e6 commit dc4ddbf

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ jobs:
4848
steps:
4949
- uses: actions/checkout@v4
5050
- uses: dtolnay/rust-toolchain@stable
51+
with:
52+
components: rustfmt
5153
- name: Check formatting
5254
run: cargo fmt --all -- --check
5355
Check:
@@ -74,7 +76,8 @@ jobs:
7476
- arm-linux-androideabi
7577
- arm64_32-apple-watchos
7678
- armv7-linux-androideabi
77-
- armv7-sony-vita-newlibeabihf
79+
# Broken, see https://github.com/rust-lang/rust/issues/147437.
80+
#- armv7-sony-vita-newlibeabihf
7881
- armv7-unknown-linux-ohos
7982
- i686-linux-android
8083
# Broken, see https://github.com/rust-lang/socket2/issues/539.
@@ -117,6 +120,8 @@ jobs:
117120
steps:
118121
- uses: actions/checkout@v4
119122
- uses: dtolnay/rust-toolchain@stable
123+
with:
124+
components: clippy
120125
- name: Run Clippy
121126
run: cargo clippy --all-targets --all-features -- -D warnings
122127
CheckExternalTypes:

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
5555
#![deny(missing_docs, missing_debug_implementations, rust_2018_idioms)]
5656
// Automatically generate required OS/features for docs.rs.
57-
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
57+
#![cfg_attr(docsrs, feature(doc_cfg))]
5858
// Disallow warnings when running tests.
5959
#![cfg_attr(test, deny(warnings))]
6060
// Disallow warnings in examples.

0 commit comments

Comments
 (0)