1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
|
This patch is based on the upstream commit described below, adapted for use
in the Debian package by Peter Michael Green.
commit 2736281a647cecb23ae1c17bbaf625b18ebf4b38
Author: Tethys Svensson <freaken@freaken.dk>
Date: Mon Dec 20 18:38:16 2021 +0100
Upgrade heck
Index: structopt-derive/src/attrs.rs
===================================================================
--- structopt-derive.orig/src/attrs.rs
+++ structopt-derive/src/attrs.rs
@@ -11,7 +11,7 @@ use crate::{parse::*, spanned::Sp, ty::T
use std::env;
-use heck::{CamelCase, KebabCase, MixedCase, ShoutySnakeCase, SnakeCase};
+use heck::{ToKebabCase, ToLowerCamelCase, ToShoutySnakeCase, ToSnakeCase, ToUpperCamelCase};
use proc_macro2::{Span, TokenStream};
use proc_macro_error::abort;
use quote::{quote, quote_spanned, ToTokens};
@@ -182,7 +182,7 @@ impl CasingStyle {
fn from_lit(name: LitStr) -> Sp<Self> {
use CasingStyle::*;
- let normalized = name.value().to_camel_case().to_lowercase();
+ let normalized = name.value().to_upper_camel_case().to_lowercase();
let cs = |kind| Sp::new(kind, name.span());
match normalized.as_ref() {
@@ -208,9 +208,9 @@ impl Name {
Name::Derived(ident) => {
let s = ident.unraw().to_string();
let s = match style {
- Pascal => s.to_camel_case(),
+ Pascal => s.to_upper_camel_case(),
Kebab => s.to_kebab_case(),
- Camel => s.to_mixed_case(),
+ Camel => s.to_lower_camel_case(),
ScreamingSnake => s.to_shouty_snake_case(),
Snake => s.to_snake_case(),
Verbatim => s,
Index: structopt-derive/Cargo.toml
===================================================================
--- structopt-derive.orig/Cargo.toml
+++ structopt-derive/Cargo.toml
@@ -24,7 +24,7 @@ repository = "https://github.com/TeXitoi
[lib]
proc-macro = true
[dependencies.heck]
-version = "0.3.0"
+version = ">= 0.4, < 0.6"
[dependencies.proc-macro-error]
version = "1.0.0"
|