Refactor

dunge/src/context.rs

@@ -121,12 +121,12 @@ impl Context {
 
 /// An error returned from the [context](Context) constructor.
 #[derive(Debug)]
-pub enum MakeContextError {
+pub enum FailedMakeContext {
     BackendSelection,
     RequestDevice(wgpu::RequestDeviceError),
 }
 
-impl fmt::Display for MakeContextError {
+impl fmt::Display for FailedMakeContext {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Self::BackendSelection => write!(f, "failed to select backend"),
@@ -135,7 +135,7 @@ impl fmt::Display for MakeContextError {
     }
 }
 
-impl error::Error for MakeContextError {
+impl error::Error for FailedMakeContext {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
         match self {
             Self::BackendSelection => None,

dunge/src/init.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        context::{Context, MakeContextError},
+        context::{Context, FailedMakeContext},
         state::State,
     },
     wgpu::Instance,
@@ -9,7 +9,7 @@ use {
 #[cfg(feature = "winit")]
 use crate::{element::Element, window::WindowBuilder};
 
-pub(crate) async fn make() -> Result<(Context, Instance), MakeContextError> {
+pub(crate) async fn make() -> Result<(Context, Instance), FailedMakeContext> {
     use wgpu::{Backends, InstanceDescriptor, InstanceFlags};
 
     let backends;
@@ -44,8 +44,8 @@ pub(crate) async fn make() -> Result<(Context, Instance), MakeContextError> {
 ///
 /// # Errors
 /// Returns an error when the context could not be created.
-/// See [`MakeContextError`] for details.
-pub async fn context() -> Result<Context, MakeContextError> {
+/// See [`FailedMakeContext`] for details.
+pub async fn context() -> Result<Context, FailedMakeContext> {
     make().await.map(|(cx, _)| cx)
 }
 

dunge/src/lib.rs

@@ -38,7 +38,7 @@ pub mod prelude {
 
 pub use {
     crate::{
-        context::{Context, MakeContextError},
+        context::{Context, FailedMakeContext},
         draw::{draw, Draw},
         format::Format,
         init::context,

dunge/src/state.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         color::Rgba,
-        context::MakeContextError,
+        context::FailedMakeContext,
         draw::Draw,
         format::Format,
         layer::{Layer, SetLayer},
@@ -23,7 +23,7 @@ pub(crate) struct State {
 }
 
 impl State {
-    pub async fn new(instance: &Instance) -> Result<Self, MakeContextError> {
+    pub async fn new(instance: &Instance) -> Result<Self, FailedMakeContext> {
         let adapter = {
             use wgpu::{PowerPreference, RequestAdapterOptions};
 
@@ -35,7 +35,7 @@ impl State {
             instance
                 .request_adapter(&options)
                 .await
-                .ok_or(MakeContextError::BackendSelection)?
+                .ok_or(FailedMakeContext::BackendSelection)?
         };
 
         let backend = adapter.get_info().backend;
@@ -58,7 +58,7 @@ impl State {
             adapter
                 .request_device(&desc, None)
                 .await
-                .map_err(MakeContextError::RequestDevice)?
+                .map_err(FailedMakeContext::RequestDevice)?
         };
 
         Ok(Self {

dunge/src/window.rs

@@ -2,7 +2,7 @@
 
 use {
     crate::{
-        context::{Context, MakeContextError},
+        context::{Context, FailedMakeContext},
         el::Loop,
         element::Element,
         format::Format,
@@ -320,8 +320,8 @@ impl From<CreateSurfaceError> for Error {
     }
 }
 
-impl From<MakeContextError> for Error {
-    fn from(v: MakeContextError) -> Self {
+impl From<FailedMakeContext> for Error {
+    fn from(v: FailedMakeContext) -> Self {
         Self(ErrorKind::Context(v))
     }
 }
@@ -356,5 +356,5 @@ enum ErrorKind {
     EventLoop(EventLoopError),
     Os(OsError),
     Surface(CreateSurfaceError),
-    Context(MakeContextError),
+    Context(FailedMakeContext),
 }

dunge_shader/src/ret.rs

@@ -4,6 +4,7 @@ use {
     std::{marker::PhantomData, ops},
 };
 
+#[must_use]
 pub struct Ret<A, O> {
     a: A,
     t: PhantomData<O>,

dunge_shader/src/texture.rs

@@ -1,46 +1,39 @@
 use {
     crate::{
-        eval::{Eval, Expr, GetEntry},
+        eval::{Eval, Expr, Fs, GetEntry},
         ret::Ret,
         types,
     },
     naga::{Expression, SampleLevel},
-    std::marker::PhantomData,
 };
 
-type Tex<T, S, C, O, E> = Ret<Samp<T, S, C, E>, types::Vec4<O>>;
+type Tex<T, S, C, O> = Ret<Samp<T, S, C>, types::Vec4<O>>;
 
-pub const fn texture_sample<T, S, C, E>(tex: T, sam: S, crd: C) -> Tex<T, S, C, f32, E>
+/// Performs the [`textureSample`](https://www.w3.org/TR/WGSL/#texturesample) function.
+pub const fn texture_sample<T, S, C>(tex: T, sam: S, crd: C) -> Tex<T, S, C, f32>
 where
-    T: Eval<E, Out = types::Texture2d<f32>>,
-    S: Eval<E, Out = types::Sampler>,
-    C: Eval<E, Out = types::Vec2<f32>>,
+    T: Eval<Fs, Out = types::Texture2d<f32>>,
+    S: Eval<Fs, Out = types::Sampler>,
+    C: Eval<Fs, Out = types::Vec2<f32>>,
 {
-    Ret::new(Samp {
-        tex,
-        sam,
-        crd,
-        e: PhantomData,
-    })
+    Ret::new(Samp { tex, sam, crd })
 }
 
-pub struct Samp<T, S, C, E> {
+pub struct Samp<T, S, C> {
     tex: T,
     sam: S,
     crd: C,
-    e: PhantomData<E>,
 }
 
-impl<T, S, C, F, E> Eval<E> for Ret<Samp<T, S, C, E>, types::Vec4<F>>
+impl<T, S, C, F> Eval<Fs> for Ret<Samp<T, S, C>, types::Vec4<F>>
 where
-    T: Eval<E, Out = types::Texture2d<F>>,
-    S: Eval<E, Out = types::Sampler>,
-    C: Eval<E, Out = types::Vec2<f32>>,
-    E: GetEntry,
+    T: Eval<Fs, Out = types::Texture2d<F>>,
+    S: Eval<Fs, Out = types::Sampler>,
+    C: Eval<Fs, Out = types::Vec2<f32>>,
 {
     type Out = types::Vec4<F>;
 
-    fn eval(self, en: &mut E) -> Expr {
+    fn eval(self, en: &mut Fs) -> Expr {
         let Samp { tex, sam, crd, .. } = self.get();
         let ex = Sampled {
             tex: tex.eval(en),