Skip to content

Commit 58471d8

Browse files
authored
Merge pull request #44 from JosiahParry/cran
Cran
2 parents 0afe135 + f76c9ec commit 58471d8

21 files changed

+3192
-215
lines changed

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: rsgeo
22
Title: An Interface to Rust's 'geo' Library
3-
Version: 0.1.6.9002
3+
Version: 0.1.7
44
Authors@R:
55
person("Josiah", "Parry", , "josiah.parry@gmail.com", role = c("aut", "cre"),
66
comment = c(ORCID = "0000-0001-9910-865X"))

R/explode.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ explode_lines <- function(x) {
2020
} else if (rlang::inherits_any(x, "rs_MULTILINESTRING")) {
2121
res <- explode_multilinestrings_(x)
2222
} else {
23-
cli::cli_abort("{.arg x} must be of class {.cls rs_LINESTRING} or {.cls rs_MULTILINESTRING")
23+
rlang::abort("`x` must be of class `rs_LINESTRING` or `rs_MULTILINESTRING`")
2424
}
2525

2626
res

configure.ac

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
AC_INIT
2+
3+
# Export PATH to include Cargo binary directory
4+
export PATH="$PATH:$HOME/.cargo/bin"
5+
6+
# Check for Rustc
7+
AC_CHECK_PROGS([RUSTC], [rustc], [no])
8+
if test "$RUSTC" = "no"; then
9+
echo "----------------------- [RUST NOT FOUND]---------------------------"
10+
echo "The 'rustc' compiler was not found on the PATH. Please install Rust"
11+
echo "from: https://www.rust-lang.org/tools/install"
12+
echo ""
13+
echo "Alternatively, you may install Rust from your OS package manager:"
14+
echo " - Debian/Ubuntu: apt-get install rustc"
15+
echo " - Fedora/CentOS: dnf install rustc"
16+
echo " - macOS: brew install rustc"
17+
echo "-------------------------------------------------------------------"
18+
echo ""
19+
exit 1
20+
fi
21+
22+
# Check if Cargo is installed
23+
if ! command -v cargo &> /dev/null; then
24+
echo "----------------------- [CARGO NOT FOUND]--------------------------"
25+
echo "The 'cargo' command was not found on the PATH. Please install Cargo"
26+
echo "from: https://www.rust-lang.org/tools/install"
27+
echo ""
28+
echo "Alternatively, you may install Cargo from your OS package manager:"
29+
echo " - Debian/Ubuntu: apt-get install cargo"
30+
echo " - Fedora/CentOS: dnf install cargo"
31+
echo " - macOS: brew install rustc"
32+
echo "-------------------------------------------------------------------"
33+
echo ""
34+
exit 1
35+
fi
36+
37+
AC_OUTPUT

0 commit comments

Comments
 (0)