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 URLs, badges, and use SPDX license format #214

Closed
wants to merge 4 commits into from
Closed

Update URLs, badges, and use SPDX license format #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d59de2
Update URLs
atouchet Nov 3, 2020
c795cc8
Fix crates.io badges
atouchet Sep 25, 2021
6add902
Use SPDX license format
atouchet May 11, 2022
ebd7429
Fix capitalization
atouchet Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name = "csv"
version = "1.1.4" #:version
authors = ["Andrew Gallant <jamslam@gmail.com>"]
description = "Fast CSV parsing with support for serde."
documentation = "http://burntsushi.net/rustdoc/csv/"
documentation = "https://docs.rs/csv"
homepage = "https://github.com/BurntSushi/rust-csv"
repository = "https://github.com/BurntSushi/rust-csv"
readme = "README.md"
keywords = ["csv", "comma", "parser", "delimited", "serde"]
license = "Unlicense/MIT"
license = "Unlicense OR MIT"
categories = ["encoding", "parser-implementations"]
exclude = ["/.travis.yml", "/appveyor.yml", "/ci/*", "/scripts/*"]
edition = "2018"
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ A fast and flexible CSV reader and writer for Rust, with support for Serde.

[![Linux build status](https://api.travis-ci.org/BurntSushi/rust-csv.svg)](https://travis-ci.org/BurntSushi/rust-csv)
[![Windows build status](https://ci.appveyor.com/api/projects/status/github/BurntSushi/rust-csv?svg=true)](https://ci.appveyor.com/project/BurntSushi/rust-csv)
[![](http://meritbadge.herokuapp.com/csv)](https://crates.io/crates/csv)
[![crates.io](https://img.shields.io/crates/v/csv.svg)](https://crates.io/crates/csv)

Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org).
Dual-licensed under MIT or the [UNLICENSE](https://unlicense.org/).


### Documentation

https://docs.rs/csv

If you're new to Rust, the
[tutorial](https://docs.rs/csv/1.0.0/csv/tutorial/index.html)
[tutorial](https://docs.rs/csv/*/csv/tutorial/index.html)
is a good place to start.


Expand All @@ -33,7 +33,7 @@ This example shows how to read CSV data from stdin and print each record to
stdout.

There are more examples in the
[cookbook](https://docs.rs/csv/1.0.0/csv/cookbook/index.html).
[cookbook](https://docs.rs/csv/*/csv/cookbook/index.html).

```rust
use std::error::Error;
Expand Down
2 changes: 1 addition & 1 deletion csv-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage = "https://github.com/BurntSushi/rust-csv"
repository = "https://github.com/BurntSushi/rust-csv"
readme = "README.md"
keywords = ["csv", "comma", "parser", "delimited", "no_std"]
license = "Unlicense/MIT"
license = "Unlicense OR MIT"
categories = ["encoding", "no-std", "parser-implementations"]
workspace = ".."
edition = "2018"
Expand Down
6 changes: 3 additions & 3 deletions csv-core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ never use the Rust standard library.

[![Linux build status](https://api.travis-ci.org/BurntSushi/rust-csv.png)](https://travis-ci.org/BurntSushi/rust-csv)
[![Windows build status](https://ci.appveyor.com/api/projects/status/github/BurntSushi/rust-csv?svg=true)](https://ci.appveyor.com/project/BurntSushi/rust-csv)
[![](http://meritbadge.herokuapp.com/csv-core)](https://crates.io/crates/csv-core)
[![crates.io](https://img.shields.io/crates/v/csv-core.svg)](https://crates.io/crates/csv-core)

Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org).
Dual-licensed under MIT or the [UNLICENSE](https://unlicense.org/).

### Documentation

Expand All @@ -19,7 +19,7 @@ Add this to your `Cargo.toml`:

```toml
[dependencies]
csv-core = "0.1.6"
csv-core = "0.1.10"
```

### Build features
Expand Down
2 changes: 1 addition & 1 deletion csv-index/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage = "https://github.com/BurntSushi/rust-csv"
repository = "https://github.com/BurntSushi/rust-csv"
readme = "README.md"
keywords = ["csv", "comma", "parser", "delimited", "index"]
license = "Unlicense/MIT"
license = "Unlicense OR MIT"
categories = ["encoding", "parser-implementations"]
workspace = ".."
edition = "2018"
Expand Down
4 changes: 2 additions & 2 deletions csv-index/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ structures that can be easily serialized to and deserialized from disk.

[![Linux build status](https://api.travis-ci.org/BurntSushi/rust-csv.png)](https://travis-ci.org/BurntSushi/rust-csv)
[![Windows build status](https://ci.appveyor.com/api/projects/status/github/BurntSushi/rust-csv?svg=true)](https://ci.appveyor.com/project/BurntSushi/rust-csv)
[![](http://meritbadge.herokuapp.com/csv-index)](https://crates.io/crates/csv-index)
[![crates.io](https://img.shields.io/crates/v/csv-index.svg)](https://crates.io/crates/csv-index)

Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org).
Dual-licensed under MIT or the [UNLICENSE](https://unlicense.org/).

### Documentation

Expand Down
8 changes: 4 additions & 4 deletions src/tutorial.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ the book first.

In this section, we'll get you setup with a simple program that reads CSV data
and prints a "debug" version of each record. This assumes that you have the
[Rust toolchain installed](https://www.rust-lang.org/install.html),
[Rust toolchain installed](https://www.rust-lang.org/tools/install),
which includes both Rust and Cargo.

We'll start by creating a new Cargo project:
Expand Down Expand Up @@ -148,7 +148,7 @@ Note that
contains an
[introduction to general error handling](https://doc.rust-lang.org/book/second-edition/ch09-00-error-handling.html).
For a deeper dive, see
[my blog post on error handling in Rust](http://blog.burntsushi.net/rust-error-handling/).
[my blog post on error handling in Rust](https://blog.burntsushi.net/rust-error-handling/).
The blog post is especially important if you plan on building Rust libraries.

With that out of the way, error handling in Rust comes in two different forms:
Expand Down Expand Up @@ -396,7 +396,7 @@ inspect the specific error condition that occurred. However, since this is a
tutorial on writing command line programs that do CSV parsing, we will consider
ourselves satisfied. If you'd like to know more, or are interested in writing
a library that handles CSV data, then you should check out my
[blog post on error handling](http://blog.burntsushi.net/rust-error-handling/).
[blog post on error handling](https://blog.burntsushi.net/rust-error-handling/).

With all that said, if all you're doing is writing a one-off program to do
CSV transformations, then using methods like `expect` and panicking when an
Expand Down Expand Up @@ -1886,7 +1886,7 @@ such a dataset, we'll use the original source of `uspop.csv`. **Warning: the
download is 41MB compressed and decompresses to 145MB.**

```text
$ curl -LO http://burntsushi.net/stuff/worldcitiespop.csv.gz
$ curl -LO https://burntsushi.net/stuff/worldcitiespop.csv.gz
$ gunzip worldcitiespop.csv.gz
$ wc worldcitiespop.csv
3173959 5681543 151492068 worldcitiespop.csv
Expand Down