Run cargo fmt --all
This commit is contained in:
parent
29e17f8cc4
commit
d719aeb4c9
@ -839,7 +839,7 @@ impl Mesh {
|
||||
if self.primitive_topology != other.primitive_topology {
|
||||
return Err(MeshMergeError::IncompatiblePrimitiveTopology {
|
||||
self_primitive_topology: self.primitive_topology,
|
||||
other_primitive_topology: other.primitive_topology
|
||||
other_primitive_topology: other.primitive_topology,
|
||||
});
|
||||
}
|
||||
|
||||
@ -1404,16 +1404,20 @@ impl MeshDeserializer {
|
||||
/// Error that can occur when calling [`Mesh::merge`].
|
||||
#[derive(Error, Debug, Clone)]
|
||||
pub enum MeshMergeError {
|
||||
#[error("Incompatible vertex attribute types {} and {}", self_attribute.name, other_attribute.map(|a| a.name).unwrap_or("None"))]
|
||||
IncompatibleVertexAttributes {
|
||||
self_attribute: MeshVertexAttribute,
|
||||
other_attribute: Option<MeshVertexAttribute>,
|
||||
},
|
||||
#[error("Incompatible primitive topologies {:?} and {:?}", self_primitive_topology, other_primitive_topology)]
|
||||
IncompatiblePrimitiveTopology {
|
||||
self_primitive_topology: PrimitiveTopology,
|
||||
other_primitive_topology: PrimitiveTopology,
|
||||
}
|
||||
#[error("Incompatible vertex attribute types {} and {}", self_attribute.name, other_attribute.map(|a| a.name).unwrap_or("None"))]
|
||||
IncompatibleVertexAttributes {
|
||||
self_attribute: MeshVertexAttribute,
|
||||
other_attribute: Option<MeshVertexAttribute>,
|
||||
},
|
||||
#[error(
|
||||
"Incompatible primitive topologies {:?} and {:?}",
|
||||
self_primitive_topology,
|
||||
other_primitive_topology
|
||||
)]
|
||||
IncompatiblePrimitiveTopology {
|
||||
self_primitive_topology: PrimitiveTopology,
|
||||
other_primitive_topology: PrimitiveTopology,
|
||||
},
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
Loading…
Reference in New Issue
Block a user