Skip to content

Commit 7c3bc87

Browse files
authored
Merge branch 'master' into cw/0.31
2 parents 4a5d5dd + aadc201 commit 7c3bc87

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

Cargo.toml

+12-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@ readme = "README.md"
1010
keywords = ["metal", "graphics", "bindings"]
1111
license = "MIT OR Apache-2.0"
1212
edition = "2021"
13-
exclude = ["guide/**/*", "examples/texture/**/*", "tests/**/*", "Cargo.lock", "target/**/*"]
13+
exclude = [
14+
"guide/**/*",
15+
"examples/texture/**/*",
16+
"tests/**/*",
17+
"Cargo.lock",
18+
"target/**/*",
19+
]
1420

1521
[package.metadata.docs.rs]
1622
targets = [
17-
"aarch64-apple-darwin", # presented first in Docs.rs, keep this here
23+
"aarch64-apple-darwin", # presented first in Docs.rs, keep this here
1824
"aarch64-apple-ios",
1925
"aarch64-apple-ios-sim",
2026
"x86_64-apple-darwin",
@@ -27,6 +33,9 @@ private = []
2733
mps = []
2834
link = ["core-graphics-types/link"]
2935

36+
# No-op feature to let cargo-cfg checking to be happy
37+
cargo-clippy = []
38+
3039
[dependencies]
3140
core-graphics-types = { version = "0.1.3", default-features = false }
3241
bitflags = "2"
@@ -102,6 +111,4 @@ required-features = ["dispatch"]
102111
name = "fence"
103112

104113
[workspace]
105-
members = [
106-
"examples/texture",
107-
]
114+
members = ["examples/texture"]

src/lib.rs

+11
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@
88
#![allow(deprecated)]
99
#![allow(non_snake_case)]
1010
#![allow(non_upper_case_globals)]
11+
// Silence clippy warnings as a stopgap to get CI working.
12+
#![allow(clippy::enum_variant_names)]
13+
#![allow(clippy::identity_op)]
14+
#![allow(clippy::let_and_return)]
15+
#![allow(clippy::missing_safety_doc)]
16+
#![allow(clippy::missing_transmute_annotations)]
17+
#![allow(clippy::new_ret_no_self)]
18+
#![allow(clippy::new_without_default)]
19+
#![allow(clippy::too_many_arguments)]
20+
#![allow(clippy::transmute_ptr_to_ref)]
21+
#![allow(clippy::unit_arg)]
1122

1223
#[macro_use]
1324
pub extern crate objc;

0 commit comments

Comments
 (0)