Skip to content

Commit 7a3861c

Browse files
authored
Merge pull request #12 from extendr/update_extendr_version
Update_extendr_version
2 parents d72d07d + 750fc81 commit 7a3861c

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
# extendr.github.io
22

33
This repository contains a dummy R project which allows us to
4-
build a website for Extendr using pkgdown.
4+
build a website for Extendr using `pkgdown`.
55

66
To build the site locally:
77

8-
```
9-
remotes::install_github("r-lib/pkgdown")
10-
devtools::install()
11-
pkgdown::build_site()
8+
```r
9+
remotes::install_github("r-lib/pkgdown")
10+
devtools::install()
11+
pkgdown::build_site()
1212
```
1313

1414
There is a github action that builds the site and deploys to
1515
the `gh-pages` branch when pushing to `main`.
1616

1717
On linux, you will also need:
1818

19-
```
19+
```shell
2020
sudo apt install fontconfig libfreetype2-dev libfontconfig1-dev libharfbuzz-dev libfribidi-dev pandoc
2121
```

index.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# extendr - A safe and user friendly R extension interface using Rust.
1+
# extendr - A safe and user friendly R extension interface using Rust
22

33
[![Github Actions Build Status](https://github.com/extendr/extendr/workflows/Tests/badge.svg)](https://github.com/extendr/extendr/actions)
44
[![Crates.io](https://img.shields.io/crates/v/extendr-api.svg)](https://crates.io/crates/extendr-api)
@@ -95,15 +95,15 @@ R type|Extendr wrapper|Deref type: `&*object`
9595
`integer`|`extendr_api::wrapper::Rint`|N/A
9696
`double`|`extendr_api::wrapper::Rfloat`|N/A
9797
`complex`|`extendr_api::wrapper::Rcplx`|N/A
98-
`extptr`|`extendr_api::wrapper::ExternalPtr<T>`|`&T`
98+
`extptr`|`extendr_api::wrapper::ExternalPtr<T>`|`&T` / `&mut T`
9999

100100
### Vector types
101101

102102
R type|Extendr wrapper|Deref type: `&*object`
103103
------|---------------|----------------------
104-
`integer`|`extendr_api::wrapper::Integer`|`&[Rint]`
104+
`integer`|`extendr_api::wrapper::Integers`|`&[Rint]`
105105
`double`|`extendr_api::wrapper::Doubles`|`&[Rfloat]`
106-
`logical`|`extendr_api::wrapper::Logical`|`&[Rbool]`
106+
`logical`|`extendr_api::wrapper::Logicals`|`&[Rbool]`
107107
`complex`|`extendr_api::wrapper::Complexes`|`&[Rcplx]`
108108
`string`|`extendr_api::wrapper::Strings`|`&[Rstr]`
109109
`list`|`extendr_api::wrapper::List`|`&[Robj]`
@@ -119,7 +119,7 @@ R type|Extendr wrapper|Deref type: `&*object`
119119

120120
## Examples
121121

122-
### Returning lists and strings.
122+
### Returning lists and strings
123123

124124
Lists and strings in rust are vectors of R objects.
125125
These are represented by the wrappers `List` and `Strings`.
@@ -188,7 +188,7 @@ fn get_na_float() -> Rfloat {
188188
We can use Extendr to take advantage of the stats and plotting functions
189189
in R.
190190

191-
For example, we could make a web server that returns plots of incomming data.
191+
For example, we could make a web server that returns plots of incoming data.
192192

193193
```rust
194194
use extendr_api::{test, Result, eval_string, eval_string_with_params};

started.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
Extendr is available on [crates.io](https://crates.io/crates/extendr-api).
44

5-
Simply add this line to the `[dependencies]` section of a rust crate.
5+
Simply add this line to the `[dependencies]` section of a rust crate's `Cargo.toml`.
66
You will then be able to call R code from Rust.
77

88
```toml
99
[dependencies]
10-
extendr-api = "0.4"
10+
extendr-api = "0.6"
1111
```
1212

1313
## Installation - R
1414

15-
There are two ways you can use the extendr API from R. First, you can use the [rextendr](https://extendr.github.io/rextendr/) package to call individual Rust functions from an R session. Second, you can write an R package that uses compiled Rust code, see the [helloextendr](https://github.com/extendr/helloextendr) repo for a minimal example.
15+
There are two ways you can use the `extendr` API from R. First, you can use the [`rextendr`](https://extendr.github.io/rextendr/) package to call individual Rust functions from an R session. Second, you can write an R package that uses compiled Rust code, see the [`helloextendr`](https://github.com/extendr/helloextendr) repo for a minimal example.

0 commit comments

Comments
 (0)