Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update CI #895

Merged
merged 2 commits into from Aug 17, 2022
Merged

update CI #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5de57a9
update CI
michaelkirk Aug 17, 2022
4a06d90
address new clippy lints
michaelkirk Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@ jobs:
matrix:
container_image:
# Use the latest stable version. No need for older versions.
- "georust/geo-ci:proj-9.0.0-rust-1.59"
- "georust/geo-ci:rust-1.63"
container:
image: ${{ matrix.container_image }}
steps:
Expand All @@ -69,7 +69,8 @@ jobs:
# Minimum supported rust version (MSRV)
- "georust/geo-ci:proj-9.0.0-rust-1.58"
# Two most recent releases - we omit older ones for expedient CI
- "georust/geo-ci:proj-9.0.0-rust-1.59"
- "georust/geo-ci:rust-1.62"
- "georust/geo-ci:rust-1.63"
container:
image: ${{ matrix.container_image }}
steps:
Expand All @@ -94,7 +95,8 @@ jobs:
# Minimum supported rust version (MSRV)
- "georust/geo-ci:proj-9.0.0-rust-1.58"
# Two most recent releases - we omit older ones for expedient CI
- "georust/geo-ci:proj-9.0.0-rust-1.59"
- "georust/geo-ci:rust-1.62"
- "georust/geo-ci:rust-1.63"
container:
image: ${{ matrix.container_image }}
steps:
Expand All @@ -120,7 +122,8 @@ jobs:
# Minimum supported rust version (MSRV)
- "georust/geo-ci:proj-9.0.0-rust-1.58"
# Two most recent releases - we omit older ones for expedient CI
- "georust/geo-ci:proj-9.0.0-rust-1.59"
- "georust/geo-ci:rust-1.62"
- "georust/geo-ci:rust-1.63"
container:
image: ${{ matrix.container_image }}
steps:
Expand All @@ -140,7 +143,7 @@ jobs:
matrix:
container_image:
# Fuzz only on latest
- "georust/geo-ci:proj-9.0.0-rust-1.59"
- "georust/geo-ci:rust-1.63"
container:
image: ${{ matrix.container_image }}
steps:
Expand All @@ -153,7 +156,7 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
container:
image: georust/geo-ci:proj-9.0.0-rust-1.59
image: georust/geo-ci:rust-1.63
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions geo/examples/concavehull-usage.rs
View file
Open in desktop
Expand Up @@ -10,10 +10,10 @@ fn generate_polygon_str(coords: &[Coordinate]) -> String {
for coord in coords {
points_str.push_str(format!("{},{} ", coord.x, coord.y).as_ref());
}
return format!(
format!(
" <polygon points=\"{}\" fill=\"none\" stroke=\"black\"/>\n",
points_str
);
)
}

fn generate_consecutive_circles(coords: &[Coordinate]) -> String {
Expand Down
2 changes: 1 addition & 1 deletion geo/src/algorithm/coordinate_position.rs
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ use crate::{coord, GeoNum, GeometryCow};
use crate::{BoundingRect, HasDimensions, Intersects};

/// The position of a `Coordinate` relative to a `Geometry`
#[derive(PartialEq, Clone, Copy, Debug)]
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
pub enum CoordPos {
OnBoundary,
Inside,
Expand Down
4 changes: 2 additions & 2 deletions geo/src/algorithm/extremes.rs
View file
Open in desktop
Expand Up @@ -28,13 +28,13 @@ pub trait Extremes<'a, T: CoordNum> {
fn extremes(&'a self) -> Option<Outcome<T>>;
}

#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Eq)]
pub struct Extreme<T: CoordNum> {
pub index: usize,
pub coord: Coordinate<T>,
}

#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Eq)]
pub struct Outcome<T: CoordNum> {
pub x_min: Extreme<T>,
pub y_min: Extreme<T>,
Expand Down
2 changes: 1 addition & 1 deletion geo/src/algorithm/relate/geomgraph/quadrant.rs
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ use crate::GeoNum;
/// SW ┃ SE
/// (-)
/// ```
#[derive(Debug, Clone, Copy, PartialOrd, PartialEq)]
#[derive(Debug, Clone, Copy, PartialOrd, PartialEq, Eq)]
pub enum Quadrant {
NE,
NW,
Expand Down
4 changes: 2 additions & 2 deletions geo/src/algorithm/simplify.rs
View file
Open in desktop
Expand Up @@ -87,9 +87,9 @@ where
if farthest_distance > *epsilon {
// The farthest index was larger than epsilon, so we will recursively simplify subsegments
// split by the farthest index.
let mut intermediate = compute_rdp(&rdp_indices[..=farthest_index], &*epsilon);
let mut intermediate = compute_rdp(&rdp_indices[..=farthest_index], epsilon);
intermediate.pop(); // Don't include the farthest index twice
intermediate.extend_from_slice(&compute_rdp(&rdp_indices[farthest_index..], &*epsilon));
intermediate.extend_from_slice(&compute_rdp(&rdp_indices[farthest_index..], epsilon));
intermediate
} else {
// The farthest index was less than or equal to epsilon, so we will retain only the first
Expand Down