Merge branch 'sotrh:master' into master

code/beginner/tutorial5-textures/src/shader.wgsl

@@ -24,7 +24,7 @@ fn vs_main(
 
 @group(0) @binding(0)
 var t_diffuse: texture_2d<f32>;
-@group(0)@binding(1)
+@group(0) @binding(1)
 var s_diffuse: sampler;
 
 @fragment

code/beginner/tutorial5-textures/src/texture.rs

@@ -1,5 +1,3 @@
-use std::num::NonZeroU32;
-
 use anyhow::*;
 use image::GenericImageView;
 

code/beginner/tutorial6-uniforms/src/texture.rs

@@ -1,5 +1,3 @@
-use std::num::NonZeroU32;
-
 use anyhow::*;
 use image::GenericImageView;
 

code/beginner/tutorial7-instancing/src/texture.rs

@@ -1,5 +1,3 @@
-use std::num::NonZeroU32;
-
 use anyhow::*;
 use image::GenericImageView;
 

code/beginner/tutorial9-models/src/texture.rs

@@ -1,6 +1,5 @@
 use anyhow::*;
 use image::GenericImageView;
-use std::num::NonZeroU32;
 
 pub struct Texture {
     pub texture: wgpu::Texture,

docs/beginner/tutorial5-textures/README.md

@@ -400,7 +400,7 @@ Now that we have our vertex shader outputting our `tex_coords`, we need to chang
 
 @group(0) @binding(0)
 var t_diffuse: texture_2d<f32>;
-@group(0)@binding(1)
+@group(0) @binding(1)
 var s_diffuse: sampler;
 
 @fragment