aboutsummaryrefslogtreecommitdiffstats
path: root/components/shared/canvas/webgl.rs
diff options
context:
space:
mode:
authoreri <eri@inventati.org>2024-03-08 16:28:19 +0100
committerGitHub <noreply@github.com>2024-03-08 15:28:19 +0000
commit43f44965cda8751e04195bf4c4f298147907843f (patch)
tree970527d416716fcd82caf89a5821c050b62a6145 /components/shared/canvas/webgl.rs
parent3a5ca785d3ecc1fd6cb5a519cf1a91ac61e15c8c (diff)
downloadservo-43f44965cda8751e04195bf4c4f298147907843f.tar.gz
servo-43f44965cda8751e04195bf4c4f298147907843f.zip
clippy: fix warnings in components/shared (#31565)
* clippy: fix some warnings in components/shared * fix: unit tests * fix: review comments
Diffstat (limited to 'components/shared/canvas/webgl.rs')
-rw-r--r--components/shared/canvas/webgl.rs29
1 files changed, 13 insertions, 16 deletions
diff --git a/components/shared/canvas/webgl.rs b/components/shared/canvas/webgl.rs
index 820f3bc7925..31d22bb3f52 100644
--- a/components/shared/canvas/webgl.rs
+++ b/components/shared/canvas/webgl.rs
@@ -140,10 +140,7 @@ pub struct WebGLMsgSender {
impl WebGLMsgSender {
pub fn new(id: WebGLContextId, sender: WebGLChan) -> Self {
- WebGLMsgSender {
- ctx_id: id,
- sender: sender,
- }
+ WebGLMsgSender { ctx_id: id, sender }
}
/// Returns the WebGLContextId associated to this sender
@@ -922,7 +919,7 @@ mod gl_ext_constants {
pub const COMPRESSED_RGBA_S3TC_DXT5_EXT: GLenum = 0x83F3;
pub const COMPRESSED_RGB_ETC1_WEBGL: GLenum = 0x8D64;
- pub static COMPRESSIONS: &'static [GLenum] = &[
+ pub static COMPRESSIONS: &[GLenum] = &[
COMPRESSED_RGB_S3TC_DXT1_EXT,
COMPRESSED_RGBA_S3TC_DXT1_EXT,
COMPRESSED_RGBA_S3TC_DXT3_EXT,
@@ -1061,18 +1058,18 @@ impl TexFormat {
/// Returns whether this format is a known sized or unsized format.
pub fn is_sized(&self) -> bool {
- match self {
+ !matches!(
+ self,
TexFormat::DepthComponent |
- TexFormat::DepthStencil |
- TexFormat::Alpha |
- TexFormat::Red |
- TexFormat::RG |
- TexFormat::RGB |
- TexFormat::RGBA |
- TexFormat::Luminance |
- TexFormat::LuminanceAlpha => false,
- _ => true,
- }
+ TexFormat::DepthStencil |
+ TexFormat::Alpha |
+ TexFormat::Red |
+ TexFormat::RG |
+ TexFormat::RGB |
+ TexFormat::RGBA |
+ TexFormat::Luminance |
+ TexFormat::LuminanceAlpha
+ )
}
pub fn to_unsized(self) -> TexFormat {