Skip to content

Commit

Permalink
Rename partial2 module to partial
Browse files Browse the repository at this point in the history
  • Loading branch information
hannobraun committed Dec 9, 2022
1 parent 0b6ba14 commit 8ecbabe
Show file tree
Hide file tree
Showing 43 changed files with 41 additions and 43 deletions.
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/approx/curve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ mod tests {
builder::{CurveBuilder, SurfaceBuilder},
geometry::path::GlobalPath,
insert::Insert,
partial2::{Partial, PartialCurve, PartialObject, PartialSurface},
partial::{Partial, PartialCurve, PartialObject, PartialSurface},
services::Services,
};

Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/intersect/curve_edge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ mod tests {
use crate::{
builder::{CurveBuilder, HalfEdgeBuilder},
objects::Vertex,
partial2::{
partial::{
Partial, PartialCurve, PartialGlobalEdge, PartialHalfEdge,
PartialObject,
},
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/intersect/curve_face.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ where
mod tests {
use crate::{
builder::{CurveBuilder, FaceBuilder},
partial2::{Partial, PartialCurve, PartialFace, PartialObject},
partial::{Partial, PartialCurve, PartialFace, PartialObject},
services::Services,
};

Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/intersect/face_face.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ mod tests {
algorithms::intersect::CurveFaceIntersection,
builder::{CurveBuilder, FaceBuilder},
insert::Insert,
partial2::{Partial, PartialCurve, PartialFace, PartialObject},
partial::{Partial, PartialCurve, PartialFace, PartialObject},
services::Services,
};

Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/intersect/face_point.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ mod tests {
builder::FaceBuilder,
insert::Insert,
iter::ObjectIters,
partial2::{PartialFace, PartialObject},
partial::{PartialFace, PartialObject},
services::Services,
};

Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/intersect/ray_face.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ mod tests {
builder::FaceBuilder,
insert::Insert,
iter::ObjectIters,
partial2::{PartialFace, PartialObject},
partial::{PartialFace, PartialObject},
services::Services,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ mod tests {
algorithms::transform::TransformObject,
builder::CurveBuilder,
insert::Insert,
partial2::{Partial, PartialCurve, PartialObject},
partial::{Partial, PartialCurve, PartialObject},
services::Services,
};

Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/reverse/face.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
insert::Insert,
objects::{Face, Objects},
partial2::{FullToPartialCache, Partial, PartialFace, PartialObject},
partial::{FullToPartialCache, Partial, PartialFace, PartialObject},
services::Service,
storage::Handle,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/sweep/curve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
geometry::path::{GlobalPath, SurfacePath},
insert::Insert,
objects::{Curve, Objects, Surface},
partial2::{PartialObject, PartialSurface},
partial::{PartialObject, PartialSurface},
services::Service,
storage::Handle,
};
Expand Down
4 changes: 2 additions & 2 deletions crates/fj-kernel/src/algorithms/sweep/edge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
Curve, Cycle, Face, GlobalEdge, HalfEdge, Objects, SurfaceVertex,
Vertex,
},
partial2::{Partial, PartialFace, PartialObject},
partial::{Partial, PartialFace, PartialObject},
services::Service,
storage::Handle,
};
Expand Down Expand Up @@ -195,7 +195,7 @@ mod tests {
builder::HalfEdgeBuilder,
insert::Insert,
objects::{Cycle, Vertex},
partial2::{
partial::{
Partial, PartialCurve, PartialFace, PartialGlobalEdge,
PartialHalfEdge, PartialObject, PartialSurfaceVertex,
PartialVertex,
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/sweep/face.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ mod tests {
builder::{FaceBuilder, HalfEdgeBuilder},
insert::Insert,
objects::{Sketch, Vertex},
partial2::{
partial::{
Partial, PartialFace, PartialGlobalEdge, PartialHalfEdge,
PartialObject,
},
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/sweep/vertex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ mod tests {
builder::{CurveBuilder, HalfEdgeBuilder},
insert::Insert,
objects::Vertex,
partial2::{
partial::{
Partial, PartialCurve, PartialGlobalEdge, PartialHalfEdge,
PartialObject, PartialSurfaceVertex, PartialVertex,
},
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/triangulate/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ mod tests {
builder::FaceBuilder,
insert::Insert,
objects::Face,
partial2::{PartialFace, PartialObject},
partial::{PartialFace, PartialObject},
services::Services,
storage::Handle,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/builder/curve.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use fj_math::{Point, Scalar, Vector};

use crate::{geometry::path::SurfacePath, partial2::PartialCurve};
use crate::{geometry::path::SurfacePath, partial::PartialCurve};

/// Builder API for [`PartialCurve`]
pub trait CurveBuilder {
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/builder/cycle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use fj_math::Point;

use crate::{
objects::{Curve, Surface, SurfaceVertex, Vertex},
partial2::{
partial::{
Partial, PartialCurve, PartialCycle, PartialGlobalEdge,
PartialHalfEdge, PartialSurfaceVertex, PartialVertex,
},
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/builder/edge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use fj_math::{Point, Scalar};

use crate::{
objects::{Curve, Surface, Vertex},
partial2::{Partial, PartialGlobalEdge, PartialHalfEdge},
partial::{Partial, PartialGlobalEdge, PartialHalfEdge},
storage::Handle,
};

Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/builder/face.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use fj_math::Point;

use crate::{
objects::Surface,
partial2::{Partial, PartialCycle, PartialFace},
partial::{Partial, PartialCycle, PartialFace},
storage::Handle,
};

Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/builder/shell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
builder::{FaceBuilder, HalfEdgeBuilder, SurfaceBuilder},
insert::Insert,
objects::{Face, FaceSet, HalfEdge, Objects, Shell, Vertex},
partial2::{
partial::{
Partial, PartialCurve, PartialCycle, PartialFace, PartialGlobalEdge,
PartialHalfEdge, PartialObject, PartialSurface, PartialSurfaceVertex,
PartialVertex,
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/builder/sketch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use fj_math::Point;
use crate::{
insert::Insert,
objects::{Face, FaceSet, Objects, Sketch, Surface},
partial2::{PartialFace, PartialObject},
partial::{PartialFace, PartialObject},
services::Service,
storage::Handle,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/builder/surface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use fj_math::{Line, Point, Vector};

use crate::{
geometry::{path::GlobalPath, surface::SurfaceGeometry},
partial2::PartialSurface,
partial::PartialSurface,
};

/// Builder API for [`PartialSurface`]
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/builder/vertex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use fj_math::Point;
use crate::{
geometry::surface::SurfaceGeometry,
objects::Curve,
partial2::{
partial::{
Partial, PartialGlobalVertex, PartialSurfaceVertex, PartialVertex,
},
};
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ mod tests {
GlobalCurve, GlobalVertex, Objects, Shell, Sketch, Solid,
SurfaceVertex, Vertex,
},
partial2::{
partial::{
Partial, PartialCurve, PartialCycle, PartialFace,
PartialGlobalEdge, PartialHalfEdge, PartialObject,
},
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ pub mod geometry;
pub mod insert;
pub mod iter;
pub mod objects;
pub mod partial2;
pub mod partial;
pub mod services;
pub mod storage;
pub mod validate;
4 changes: 1 addition & 3 deletions crates/fj-kernel/src/objects/full/edge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ mod tests {
use crate::{
builder::HalfEdgeBuilder,
objects::Vertex,
partial2::{
Partial, PartialGlobalEdge, PartialHalfEdge, PartialObject,
},
partial::{Partial, PartialGlobalEdge, PartialHalfEdge, PartialObject},
services::Services,
};

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
geometry::path::SurfacePath,
objects::{Curve, GlobalCurve, Objects, Surface},
partial2::{FullToPartialCache, Partial, PartialObject},
partial::{FullToPartialCache, Partial, PartialObject},
services::Service,
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
objects::{Cycle, HalfEdge, Objects, Surface},
partial2::{FullToPartialCache, Partial, PartialObject},
partial::{FullToPartialCache, Partial, PartialObject},
services::Service,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::{
objects::{
Curve, GlobalCurve, GlobalEdge, GlobalVertex, HalfEdge, Objects, Vertex,
},
partial2::{FullToPartialCache, Partial, PartialObject, PartialVertex},
partial::{FullToPartialCache, Partial, PartialObject, PartialVertex},
services::Service,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use fj_interop::mesh::Color;

use crate::{
objects::{Cycle, Face, Objects},
partial2::{FullToPartialCache, Partial, PartialObject},
partial::{FullToPartialCache, Partial, PartialObject},
services::Service,
};

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
objects::{Face, Objects, Shell},
partial2::{FullToPartialCache, Partial, PartialObject},
partial::{FullToPartialCache, Partial, PartialObject},
services::Service,
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
objects::{Face, Objects, Sketch},
partial2::{FullToPartialCache, Partial, PartialObject},
partial::{FullToPartialCache, Partial, PartialObject},
services::Service,
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
objects::{Objects, Shell, Solid},
partial2::{FullToPartialCache, Partial, PartialObject},
partial::{FullToPartialCache, Partial, PartialObject},
services::Service,
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
geometry::surface::SurfaceGeometry,
objects::{Objects, Surface},
partial2::{FullToPartialCache, PartialObject},
partial::{FullToPartialCache, PartialObject},
services::Service,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use fj_math::Point;
use crate::{
builder::SurfaceVertexBuilder,
objects::{Curve, GlobalVertex, Objects, Surface, SurfaceVertex, Vertex},
partial2::{FullToPartialCache, Partial, PartialCurve, PartialObject},
partial::{FullToPartialCache, Partial, PartialCurve, PartialObject},
services::Service,
};

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use type_map::TypeMap;
use crate::{
insert::Insert,
objects::Objects,
partial2::traits::PartialObject,
partial::traits::PartialObject,
services::Service,
storage::{Handle, ObjectId},
};
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/validate/cycle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ mod tests {
use crate::{
builder::CycleBuilder,
objects::Cycle,
partial2::{Partial, PartialCycle, PartialObject},
partial::{Partial, PartialCycle, PartialObject},
services::Services,
validate::Validate,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/validate/edge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ mod tests {
builder::HalfEdgeBuilder,
insert::Insert,
objects::{GlobalCurve, HalfEdge, Vertex},
partial2::{
partial::{
Partial, PartialGlobalEdge, PartialHalfEdge, PartialObject,
PartialSurfaceVertex, PartialVertex,
},
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/validate/face.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ mod tests {
builder::{CycleBuilder, FaceBuilder},
insert::Insert,
objects::Face,
partial2::{PartialCycle, PartialFace, PartialObject},
partial::{PartialCycle, PartialFace, PartialObject},
services::Services,
validate::Validate,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/validate/vertex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ mod tests {
builder::{CurveBuilder, SurfaceVertexBuilder},
insert::Insert,
objects::{GlobalVertex, SurfaceVertex, Vertex},
partial2::{
partial::{
Partial, PartialCurve, PartialObject, PartialSurfaceVertex,
PartialVertex,
},
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-operations/src/difference_2d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use fj_kernel::{
insert::Insert,
iter::ObjectIters,
objects::{Objects, Sketch},
partial2::{Partial, PartialFace, PartialObject},
partial::{Partial, PartialFace, PartialObject},
services::Service,
};
use fj_math::Aabb;
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-operations/src/sketch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use fj_kernel::{
builder::{FaceBuilder, HalfEdgeBuilder},
insert::Insert,
objects::{Objects, Sketch, Vertex},
partial2::{
partial::{
Partial, PartialCurve, PartialCycle, PartialFace, PartialGlobalEdge,
PartialHalfEdge, PartialObject, PartialSurfaceVertex, PartialVertex,
},
Expand Down

0 comments on commit 8ecbabe

Please sign in to comment.