Fix rebase errors

zylkowski · May 15, 2022 · ec35275 · ec35275
1 parent 8463de7
commit ec35275
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/build/textures.rs b/build/textures.rs
@@ -324,8 +324,6 @@ fn build_texture<W: Write>(dest: &mut W, ty: TextureType, dimensions: TextureDim
  use crate::backend::Facade;
  use crate::uniforms::{{UniformValue, AsUniformValue, Sampler, ImageUnit, ImageUnitError, ImageUnitFormat}};
  use crate::framebuffer;
- use Rect;
-
 
  use crate::Rect;
 

diff --git a/src/backend/mod.rs b/src/backend/mod.rs
@@ -26,7 +26,6 @@ use crate::version::Version;
 pub use crate::context::Context;
 pub use crate::context::ReleaseBehavior;
 
-
 #[cfg(feature = "glutin")]
 pub mod glutin;
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -1165,7 +1165,7 @@ impl fmt::Display for DrawError {
  "Tried to use more image uniforms that the implementation has support for",
  };
 
- match *self {
+ match self {
  UniformTypeMismatch { ref name, ref expected } =>
  write!(
  fmt,

diff --git a/src/uniforms/bind.rs b/src/uniforms/bind.rs
@@ -780,7 +780,7 @@ fn bind_image_uniform<P, T>(
 ) -> Result<(), DrawError>
  where P: ProgramExt, T: TextureExt
 {
- use ToGlEnum;
+ use crate::ToGlEnum;
 
  let unit_behavior = unit_behavior.expect("Unit behavior should always be provided");
  let image_unit = match image_unit_bind_points.get_unused() {