Skip to content

Commit 290b24f

Browse files
committed
Merge remote-tracking branch 'apache/master' into simplify-record-reader
2 parents 9930e50 + e0abda2 commit 290b24f

File tree

2 files changed

+18
-21
lines changed

2 files changed

+18
-21
lines changed

.github/workflows/rust.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
# these represent dependencies downloaded by cargo
4747
# and thus do not depend on the OS, arch nor rust version.
4848
path: /github/home/.cargo
49-
key: cargo-cache2-
49+
key: cargo-cache3-
5050
- name: Cache Rust dependencies
5151
uses: actions/cache@v2
5252
with:
5353
# these represent compiled steps of both dependencies and arrow
5454
# and thus are specific for a particular OS, arch and rust version.
5555
path: /github/home/target
56-
key: ${{ runner.os }}-${{ matrix.arch }}-target-cache-${{ matrix.rust }}-
56+
key: ${{ runner.os }}-${{ matrix.arch }}-target-cache3-${{ matrix.rust }}-
5757
- name: Setup Rust toolchain
5858
run: |
5959
rustup toolchain install ${{ matrix.rust }}
@@ -91,13 +91,13 @@ jobs:
9191
with:
9292
path: /github/home/.cargo
9393
# this key equals the ones on `linux-build-lib` for re-use
94-
key: cargo-cache2-
94+
key: cargo-cache3-
9595
- name: Cache Rust dependencies
9696
uses: actions/cache@v2
9797
with:
9898
path: /github/home/target
9999
# this key equals the ones on `linux-build-lib` for re-use
100-
key: ${{ runner.os }}-${{ matrix.arch }}-target-cache-${{ matrix.rust }}
100+
key: ${{ runner.os }}-${{ matrix.arch }}-target-cache3-${{ matrix.rust }}
101101
- name: Setup Rust toolchain
102102
run: |
103103
rustup toolchain install ${{ matrix.rust }}
@@ -147,14 +147,12 @@ jobs:
147147
uses: actions/cache@v2
148148
with:
149149
path: /github/home/.cargo
150-
# this key equals the ones on `linux-build-lib` for re-use
151-
key: cargo-cache2-
150+
key: cargo-nightly-cache3-
152151
- name: Cache Rust dependencies
153152
uses: actions/cache@v2
154153
with:
155154
path: /github/home/target
156-
# this key equals the ones on `linux-build-lib` for re-use
157-
key: ${{ runner.os }}-${{ matrix.arch }}-target-cache-${{ matrix.rust }}
155+
key: ${{ runner.os }}-${{ matrix.arch }}-target-nightly-cache3-${{ matrix.rust }}
158156
- name: Setup Rust toolchain
159157
run: |
160158
rustup toolchain install ${{ matrix.rust }}
@@ -223,13 +221,13 @@ jobs:
223221
with:
224222
path: /github/home/.cargo
225223
# this key equals the ones on `linux-build-lib` for re-use
226-
key: cargo-cache2-
224+
key: cargo-cache3-
227225
- name: Cache Rust dependencies
228226
uses: actions/cache@v2
229227
with:
230228
path: /github/home/target
231229
# this key equals the ones on `linux-build-lib` for re-use
232-
key: ${{ runner.os }}-${{ matrix.arch }}-target-cache-${{ matrix.rust }}
230+
key: ${{ runner.os }}-${{ matrix.arch }}-target-cache3-${{ matrix.rust }}
233231
- name: Setup Rust toolchain
234232
run: |
235233
rustup toolchain install ${{ matrix.rust }}
@@ -277,13 +275,13 @@ jobs:
277275
with:
278276
path: /home/runner/.cargo
279277
# this key is not equal because the user is different than on a container (runner vs github)
280-
key: cargo-coverage-cache-
278+
key: cargo-coverage-cache3-
281279
- name: Cache Rust dependencies
282280
uses: actions/cache@v2
283281
with:
284282
path: /home/runner/target
285283
# this key is not equal because coverage uses different compilation flags.
286-
key: ${{ runner.os }}-${{ matrix.arch }}-target-coverage-cache-${{ matrix.rust }}-
284+
key: ${{ runner.os }}-${{ matrix.arch }}-target-coverage-cache3-${{ matrix.rust }}-
287285
- name: Run coverage
288286
run: |
289287
export CARGO_HOME="/home/runner/.cargo"
@@ -324,13 +322,12 @@ jobs:
324322
uses: actions/cache@v2
325323
with:
326324
path: /github/home/.cargo
327-
# this key equals the ones on `linux-build-lib` for re-use
328-
key: cargo-cache2-
325+
key: cargo-wasm32-cache3-
329326
- name: Cache Rust dependencies
330327
uses: actions/cache@v2
331328
with:
332329
path: /github/home/target
333-
key: ${{ runner.os }}-${{ matrix.arch }}-target-wasm32-cache-${{ matrix.rust }}
330+
key: ${{ runner.os }}-${{ matrix.arch }}-target-wasm32-cache3-${{ matrix.rust }}
334331
- name: Setup Rust toolchain
335332
run: |
336333
rustup toolchain install ${{ matrix.rust }}
@@ -366,13 +363,13 @@ jobs:
366363
with:
367364
path: /github/home/.cargo
368365
# this key equals the ones on `linux-build-lib` for re-use
369-
key: cargo-cache2-
366+
key: cargo-cache3-
370367
- name: Cache Rust dependencies
371368
uses: actions/cache@v2
372369
with:
373370
path: /github/home/target
374371
# this key equals the ones on `linux-build-lib` for re-use
375-
key: ${{ runner.os }}-${{ matrix.arch }}-target-cache-${{ matrix.rust }}
372+
key: ${{ runner.os }}-${{ matrix.arch }}-target-cache3-${{ matrix.rust }}
376373
- name: Setup Rust toolchain
377374
run: |
378375
rustup toolchain install ${{ matrix.rust }}

arrow/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
//!
9090
//! ## Compute
9191
//!
92-
//! This crate offers many operations (called kernels) to operate on `Array`s, that you can find at [compute::kernels].
92+
//! This crate offers many operations (called kernels) to operate on [`Array`](array::Array)s, that you can find at [`Kernel`](compute::kernels).
9393
//! It has both vertical and horizontal operations, and some of them have an SIMD implementation.
9494
//!
9595
//! ## Status
@@ -118,9 +118,9 @@
118118
//!
119119
//! Finally, this crate implements some readers and writers to different formats:
120120
//!
121-
//! * json: [reader](json::reader::Reader)
122-
//! * csv: [reader](csv::reader::Reader) and [writer](csv::writer::Writer)
123-
//! * ipc: [reader](ipc::reader::StreamReader) and [writer](ipc::writer::FileWriter)
121+
//! * JSON: [`Reader`](json::reader::Reader)
122+
//! * CSV: [`Reader`](csv::reader::Reader) and [`Writer`](csv::writer::Writer)
123+
//! * IPC: [`Reader`](ipc::reader::StreamReader) and [`Writer`](ipc::writer::FileWriter)
124124
//!
125125
//! The parquet implementation is on a [separate crate](https://crates.io/crates/parquet)
126126

0 commit comments

Comments
 (0)