[lib] Move compiler_version, geographiclib_version to internal

Author: mshroyer

src/bin/cli.rs

@@ -10,10 +10,9 @@ use clap::builder::styling::Styles;
 use clap::{Args, ColorChoice, Parser, Subcommand, ValueEnum, command, crate_version};
 use clap_cargo::style::{ERROR, HEADER, INVALID, LITERAL, PLACEHOLDER, USAGE, VALID};
 use coursepointer::course::{CourseSetOptions, InterceptStrategy};
-use coursepointer::internal::{Kilometer, Mile};
+use coursepointer::internal::{Kilometer, Mile, compiler_version, geographiclib_version};
 use coursepointer::{
     ConversionInfo, CoursePointType, CoursePointerError, FitCourseOptions, FitEncodeError, Sport,
-    compiler_version, geographiclib_version,
 };
 use dimensioned::f64prefixes::KILO;
 use dimensioned::si::{HR, M, Meter};
@@ -37,7 +36,7 @@ pub const CLAP_STYLING: Styles = Styles::styled()
 
 static LONG_VERSION: LazyLock<String> = LazyLock::new(|| {
     format!(
-        "{} (GeographicLib {}, rustc {}, {})",
+        "{} ({}, rustc {}, {})",
         crate_version!(),
         geographiclib_version(),
         env!("RUSTC_VERSION"),

src/internal.rs

@@ -8,6 +8,7 @@ use dimensioned::si::Meter;
 
 use crate::GeoPoint;
 use crate::algorithm::{FromGeoPoints, intercept_distance_floor, karney_interception};
+pub use crate::ffi::{compiler_version, geographiclib_version};
 pub use crate::fit::PROFILE_VERSION;
 use crate::geographic::geodesic_inverse;
 pub use crate::measure::{Kilometer, Mile};

src/lib.rs

@@ -65,7 +65,6 @@ use crate::algorithm::AlgorithmError;
 use crate::course::{
     Course, CourseError, CoursePoint, CourseSet, CourseSetBuilder, CourseSetOptions,
 };
-pub use crate::ffi::{compiler_version, geographiclib_version};
 pub use crate::fit::{CourseFile, CoursePointType, Sport};
 use crate::geographic::GeographicError;
 use crate::gpx::{GpxItem, GpxReader};

src/shim.cpp

@@ -55,7 +55,7 @@ void geocentric_forward(
 }
 
 rust::Str geographiclib_version() noexcept {
-  return GEOGRAPHICLIB_VERSION_STRING;
+  return "GeographicLib " GEOGRAPHICLIB_VERSION_STRING;
 }
 
 static std::string ver_string;