From 517ef2beaefa057917a0d5fa74175d11a20e698d Mon Sep 17 00:00:00 2001
From: gwenn <45554+gwenn@users.noreply.github.com>
Date: Sat, 3 Apr 2021 20:07:53 +0200
Subject: [PATCH] Prepare release 0.25.0 (#930)

rusqlite 0.25.0
libsqlite3-sys 0.22.0
Also fix missing README for libsqlite3-sys crate
And fix a typo.
---
 Cargo.toml                | 4 ++--
 README.md                 | 6 +++---
 libsqlite3-sys/Cargo.toml | 2 +-
 libsqlite3-sys/README.md  | 1 +
 src/collation.rs          | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
 create mode 120000 libsqlite3-sys/README.md

diff --git a/Cargo.toml b/Cargo.toml
index 6b98fb8..4b2523c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rusqlite"
-version = "0.24.2"
+version = "0.25.0"
 authors = ["The rusqlite developers"]
 edition = "2018"
 description = "Ergonomic wrapper for SQLite"
@@ -123,7 +123,7 @@ bencher = "0.1"
 
 [dependencies.libsqlite3-sys]
 path = "libsqlite3-sys"
-version = "0.21.0"
+version = "0.22.0"
 
 [[test]]
 name = "config_log"
diff --git a/README.md b/README.md
index c1796c6..c95fa62 100644
--- a/README.md
+++ b/README.md
@@ -124,11 +124,11 @@ You can adjust this behavior in a number of ways:
 * If you use the `bundled` feature, `libsqlite3-sys` will use the
   [cc](https://crates.io/crates/cc) crate to compile SQLite from source and
   link against that. This source is embedded in the `libsqlite3-sys` crate and
-  is currently SQLite 3.34.0 (as of `rusqlite` 0.24.1 / `libsqlite3-sys`
-  0.21.0).  This is probably the simplest solution to any build problems. You can enable this by adding the following in your `Cargo.toml` file:
+  is currently SQLite 3.35.4 (as of `rusqlite` 0.25.0 / `libsqlite3-sys`
+  0.22.0).  This is probably the simplest solution to any build problems. You can enable this by adding the following in your `Cargo.toml` file:
   ```toml
   [dependencies.rusqlite]
-  version = "0.24.2"
+  version = "0.25.0"
   features = ["bundled"]
   ```
 * When using the `bundled` feature, the build script will honor `SQLITE_MAX_VARIABLE_NUMBER` and `SQLITE_MAX_EXPR_DEPTH` variables. It will also honor a `LIBSQLITE3_FLAGS` variable, which can have a format like `"-USQLITE_ALPHA -DSQLITE_BETA SQLITE_GAMMA ..."`. That would disable the `SQLITE_ALPHA` flag, and set the `SQLITE_BETA` and `SQLITE_GAMMA` flags. (The initial `-D` can be omitted, as on the last one.)
diff --git a/libsqlite3-sys/Cargo.toml b/libsqlite3-sys/Cargo.toml
index 19d3b44..69d59cd 100644
--- a/libsqlite3-sys/Cargo.toml
+++ b/libsqlite3-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libsqlite3-sys"
-version = "0.21.0"
+version = "0.22.0"
 authors = ["The rusqlite developers"]
 edition = "2018"
 repository = "https://github.com/rusqlite/rusqlite"
diff --git a/libsqlite3-sys/README.md b/libsqlite3-sys/README.md
new file mode 120000
index 0000000..32d46ee
--- /dev/null
+++ b/libsqlite3-sys/README.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/src/collation.rs b/src/collation.rs
index 100bb82..2b93a9a 100644
--- a/src/collation.rs
+++ b/src/collation.rs
@@ -130,7 +130,7 @@ impl InnerConnection {
                 let conn = Connection::from_handle(arg2).unwrap();
                 let collation_name = {
                     let c_slice = CStr::from_ptr(arg3).to_bytes();
-                    str::from_utf8(c_slice).expect("illegal coallation sequence name")
+                    str::from_utf8(c_slice).expect("illegal collation sequence name")
                 };
                 callback(&conn, collation_name)
             });