Skip to content

Commit 6260f90

Browse files
authored
Merge branch 'rust-windowing:master' into optional-wayland-sys
2 parents 5ed3347 + ef60557 commit 6260f90

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
components: rustfmt
1818
- name: Check Formatting
1919
run: cargo +stable fmt --all -- --check
20-
- uses: taiki-e/install-action@v2
20+
- uses: taiki-e/install-action@v2
2121
with:
2222
tool: typos-cli
2323
- name: Check Formatting
@@ -88,10 +88,9 @@ jobs:
8888
- name: Pin deps that break MSRV
8989
if: matrix.rust_version == '1.70.0'
9090
run: |
91-
cargo update -p exr --precise 1.71.0
9291
cargo update -p ahash --precise 0.8.7
9392
cargo update -p bumpalo --precise 3.14.0
94-
93+
9594
- name: Build crate
9695
shell: bash
9796
run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ features = ["jpeg"]
9191

9292
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
9393
# Turn rayon back on everywhere else; creating the separate entry resets the features to default.
94-
image = "0.25.0"
9594
rayon = "1.5.1"
9695

9796
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![doc = include_str!("../README.md")]
2+
#![allow(clippy::needless_doctest_main)]
23
#![deny(unsafe_op_in_unsafe_fn)]
34
#![warn(missing_docs)]
45
#![cfg_attr(docsrs, feature(doc_auto_cfg))]

0 commit comments

Comments
 (0)