diff --git a/Cargo.toml b/Cargo.toml index 0f60210e..bd73f442 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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", "serde"] -license = "Unlicense/MIT" +license = "Unlicense OR MIT" categories = ["encoding", "parser-implementations"] exclude = ["/.github", "/ci/*", "/scripts/*"] edition = "2021" diff --git a/README.md b/README.md index e1d84430..29538319 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ A fast and flexible CSV reader and writer for Rust, with support for Serde. [![Build status](https://github.com/BurntSushi/rust-csv/workflows/ci/badge.svg)](https://github.com/BurntSushi/rust-csv/actions) [![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 @@ -13,7 +13,7 @@ Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org). 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. @@ -32,7 +32,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, io, process}; diff --git a/csv-core/Cargo.toml b/csv-core/Cargo.toml index 110ee06c..46e6ee1c 100644 --- a/csv-core/Cargo.toml +++ b/csv-core/Cargo.toml @@ -8,15 +8,11 @@ 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" -[badges] -travis-ci = { repository = "BurntSushi/rust-csv" } -appveyor = { repository = "BurntSushi/rust-csv" } - [lib] bench = false diff --git a/csv-core/README.md b/csv-core/README.md index 07afd997..ccf89954 100644 --- a/csv-core/README.md +++ b/csv-core/README.md @@ -3,11 +3,10 @@ csv-core A fast CSV reader and write for use in a `no_std` context. This crate will 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) +[![Build status](https://github.com/BurntSushi/rust-csv/workflows/ci/badge.svg)](https://github.com/BurntSushi/rust-csv/actions) +[![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 @@ -19,7 +18,7 @@ Add this to your `Cargo.toml`: ```toml [dependencies] -csv-core = "0.1.6" +csv-core = "0.1.12" ``` ### Build features diff --git a/csv-index/Cargo.toml b/csv-index/Cargo.toml index 6459bd39..b1986f5e 100644 --- a/csv-index/Cargo.toml +++ b/csv-index/Cargo.toml @@ -8,15 +8,11 @@ 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" -[badges] -travis-ci = { repository = "BurntSushi/rust-csv" } -appveyor = { repository = "BurntSushi/rust-csv" } - [lib] bench = false diff --git a/csv-index/README.md b/csv-index/README.md index a8c92096..c9c1225d 100644 --- a/csv-index/README.md +++ b/csv-index/README.md @@ -3,11 +3,10 @@ csv-index A collection of data structures for indexing CSV data, with a focus on data 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) +[![Build status](https://github.com/BurntSushi/rust-csv/workflows/ci/badge.svg)](https://github.com/BurntSushi/rust-csv/actions) +[![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 diff --git a/src/tutorial.rs b/src/tutorial.rs index 7bce7c00..1b582aea 100644 --- a/src/tutorial.rs +++ b/src/tutorial.rs @@ -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: @@ -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: @@ -391,7 +391,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 @@ -1853,7 +1853,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