From 5b85a034da9d97976c4d67f7c53e5120c0c88a14 Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo@paolo565.org>
Date: Tue, 1 Mar 2022 00:51:50 +0100
Subject: [PATCH] Update heck to 0.4 (#1725)

---
 Cargo.lock                     | 5 ++++-
 sqlx-macros/Cargo.toml         | 2 +-
 sqlx-macros/src/derives/mod.rs | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 25c2d13700..9505ec3c3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1079,6 +1079,9 @@ name = "heck"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+dependencies = [
+ "unicode-segmentation",
+]
 
 [[package]]
 name = "hermit-abi"
@@ -2550,7 +2553,7 @@ version = "0.5.11"
 dependencies = [
  "dotenv",
  "either",
- "heck 0.3.3",
+ "heck 0.4.0",
  "hex",
  "once_cell",
  "proc-macro2",
diff --git a/sqlx-macros/Cargo.toml b/sqlx-macros/Cargo.toml
index 98ae6ad206..b6c6c99b08 100644
--- a/sqlx-macros/Cargo.toml
+++ b/sqlx-macros/Cargo.toml
@@ -80,7 +80,7 @@ json = ["sqlx-core/json", "serde_json"]
 [dependencies]
 dotenv = { version = "0.15.0", default-features = false }
 hex = { version = "0.4.3", optional = true }
-heck = "0.3.3"
+heck = { version = "0.4", features = ["unicode"] }
 either = "1.6.1"
 once_cell = "1.9.0"
 proc-macro2 = { version = "1.0.36", default-features = false }
diff --git a/sqlx-macros/src/derives/mod.rs b/sqlx-macros/src/derives/mod.rs
index b08c3d4ee7..a1711ba0dc 100644
--- a/sqlx-macros/src/derives/mod.rs
+++ b/sqlx-macros/src/derives/mod.rs
@@ -10,7 +10,7 @@ pub(crate) use r#type::expand_derive_type;
 pub(crate) use row::expand_derive_from_row;
 
 use self::attributes::RenameAll;
-use heck::{CamelCase, KebabCase, MixedCase, ShoutySnakeCase, SnakeCase};
+use heck::{ToKebabCase, ToLowerCamelCase, ToShoutySnakeCase, ToSnakeCase, ToUpperCamelCase};
 use proc_macro2::TokenStream;
 use std::iter::FromIterator;
 use syn::DeriveInput;
@@ -32,7 +32,7 @@ pub(crate) fn rename_all(s: &str, pattern: RenameAll) -> String {
         RenameAll::UpperCase => s.to_uppercase(),
         RenameAll::ScreamingSnakeCase => s.to_shouty_snake_case(),
         RenameAll::KebabCase => s.to_kebab_case(),
-        RenameAll::CamelCase => s.to_mixed_case(),
-        RenameAll::PascalCase => s.to_camel_case(),
+        RenameAll::CamelCase => s.to_lower_camel_case(),
+        RenameAll::PascalCase => s.to_upper_camel_case(),
     }
 }