From 8a9f475edb51ea45c976c000113ca55bac751f96 Mon Sep 17 00:00:00 2001 From: MinerSebas Date: Fri, 12 Mar 2021 03:05:14 +0000 Subject: [PATCH] Remove the Clippy "-A clippy::manual-strip" override (#1619) That override was added to support pre 1.45 Versions of Rust, but Bevy requires currently the latest stable rust release. This means that the reason for the override doesn't apply anymore. --- crates/bevy_gltf/src/loader.rs | 9 ++++----- docs/linters.md | 1 - tools/ci/src/main.rs | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs index e48fd99078..8c59d40cfe 100644 --- a/crates/bevy_gltf/src/loader.rs +++ b/crates/bevy_gltf/src/loader.rs @@ -484,11 +484,10 @@ async fn load_buffers( match buffer.source() { gltf::buffer::Source::Uri(uri) => { if uri.starts_with("data:") { - if uri.starts_with(OCTET_STREAM_URI) { - buffer_data.push(base64::decode(&uri[OCTET_STREAM_URI.len()..])?); - } else { - return Err(GltfError::BufferFormatUnsupported); - } + buffer_data.push(base64::decode( + uri.strip_prefix(OCTET_STREAM_URI) + .ok_or(GltfError::BufferFormatUnsupported)?, + )?); } else { // TODO: Remove this and add dep let buffer_path = asset_path.parent().unwrap().join(uri); diff --git a/docs/linters.md b/docs/linters.md index aefbdaa562..168021677c 100644 --- a/docs/linters.md +++ b/docs/linters.md @@ -18,7 +18,6 @@ cargo clippy --all-targets --all-features -- -D warnings -A clippy::type_complex * `-D warnings`: No warnings are allowed in the codebase. * `-A clippy::type_complexity`: type complexity must be ignored because we use huge templates for queries. -* `-A clippy::manual-strip`: strip_prefix support was added in 1.45. We want to support earlier rust versions. ## [super-linter](https://github.com/github/super-linter) diff --git a/tools/ci/src/main.rs b/tools/ci/src/main.rs index fd2eea77f7..35a4f876a0 100644 --- a/tools/ci/src/main.rs +++ b/tools/ci/src/main.rs @@ -13,8 +13,7 @@ fn main() { // See if clippy has any complaints. // - Type complexity must be ignored because we use huge templates for queries - // - `-A clippy::manual-strip` strip_prefix support was added in 1.45 - cmd!("cargo clippy --workspace --all-targets --all-features -- -D warnings -A clippy::type_complexity -A clippy::manual-strip") + cmd!("cargo clippy --workspace --all-targets --all-features -- -D warnings -A clippy::type_complexity") .run() .expect("Please fix clippy errors in output above."); }