Skip to content

Commit 0e65a20

Browse files
mhallinmhallin
authored
Merge pull request #9 from zaeleus/to_camel_case
Rename erroneously named to_snake_case
2 parents ccf6b83 + b0c4334 commit 0e65a20

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎src/lib.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ impl ToJson for ExecutionError {
342342
}
343343

344344
#[doc(hidden)]
345-
pub fn to_snake_case(s: &str) -> String {
345+
pub fn to_camel_case(s: &str) -> String {
346346
let mut dest = String::new();
347347

348348
for (i, part) in s.split('_').enumerate() {
@@ -365,14 +365,14 @@ pub fn to_snake_case(s: &str) -> String {
365365
}
366366

367367
#[test]
368-
fn test_to_snake_case() {
369-
assert_eq!(&to_snake_case("test")[..], "test");
370-
assert_eq!(&to_snake_case("_test")[..], "Test");
371-
assert_eq!(&to_snake_case("first_second")[..], "firstSecond");
372-
assert_eq!(&to_snake_case("first_")[..], "first");
373-
assert_eq!(&to_snake_case("a_b_c")[..], "aBC");
374-
assert_eq!(&to_snake_case("a_bc")[..], "aBc");
375-
assert_eq!(&to_snake_case("a_b")[..], "aB");
376-
assert_eq!(&to_snake_case("a")[..], "a");
377-
assert_eq!(&to_snake_case("")[..], "");
368+
fn test_to_camel_case() {
369+
assert_eq!(&to_camel_case("test")[..], "test");
370+
assert_eq!(&to_camel_case("_test")[..], "Test");
371+
assert_eq!(&to_camel_case("first_second")[..], "firstSecond");
372+
assert_eq!(&to_camel_case("first_")[..], "first");
373+
assert_eq!(&to_camel_case("a_b_c")[..], "aBC");
374+
assert_eq!(&to_camel_case("a_bc")[..], "aBc");
375+
assert_eq!(&to_camel_case("a_b")[..], "aB");
376+
assert_eq!(&to_camel_case("a")[..], "a");
377+
assert_eq!(&to_camel_case("")[..], "");
378378
}

‎src/macros/args.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ macro_rules! __graphql__args {
2727
$name:ident $(= $default:tt)* : $ty:ty $(as $desc:tt)*, $($rest:tt)*
2828
) => {
2929
let $name: $ty = $args
30-
.get(&$crate::to_snake_case(stringify!($name)))
30+
.get(&$crate::to_camel_case(stringify!($name)))
3131
.expect("Argument missing - validation must have failed");
3232
__graphql__args!(@assign_arg_vars, $args, $executorvar, $($rest)*);
3333
};
@@ -38,7 +38,7 @@ macro_rules! __graphql__args {
3838
$name:ident $(= $default:tt)* : $ty:ty $(as $desc:expr)*
3939
) => {
4040
let $name: $ty = $args
41-
.get(&$crate::to_snake_case(stringify!($name)))
41+
.get(&$crate::to_camel_case(stringify!($name)))
4242
.expect("Argument missing - validation must have failed");
4343
};
4444

@@ -73,7 +73,7 @@ macro_rules! __graphql__args {
7373
$reg:expr, $base:expr, ( $name:ident = $default:tt : $t:ty )
7474
) => {
7575
$base.argument($reg.arg_with_default::<$t>(
76-
&$crate::to_snake_case(stringify!($name)),
76+
&$crate::to_camel_case(stringify!($name)),
7777
&__graphql__args!(@as_expr, $default)))
7878
};
7979

@@ -85,7 +85,7 @@ macro_rules! __graphql__args {
8585
@apply_args,
8686
$reg,
8787
$base.argument($reg.arg_with_default::<$t>(
88-
&$crate::to_snake_case(stringify!($name)),
88+
&$crate::to_camel_case(stringify!($name)),
8989
&__graphql__args!(@as_expr, $default))),
9090
( $($rest)* ))
9191
};
@@ -99,7 +99,7 @@ macro_rules! __graphql__args {
9999
@apply_args,
100100
$reg,
101101
$base.argument($reg.arg_with_default::<$t>(
102-
&$crate::to_snake_case(stringify!($name)),
102+
&$crate::to_camel_case(stringify!($name)),
103103
&__graphql__args!(@as_expr, $default))
104104
.description($desc)),
105105
( $($rest)* ))
@@ -110,7 +110,7 @@ macro_rules! __graphql__args {
110110
$reg:expr, $base:expr, ( $name:ident : $t:ty )
111111
) => {
112112
$base.argument($reg.arg::<$t>(
113-
&$crate::to_snake_case(stringify!($name))))
113+
&$crate::to_camel_case(stringify!($name))))
114114
};
115115

116116
(
@@ -121,7 +121,7 @@ macro_rules! __graphql__args {
121121
@apply_args,
122122
$reg,
123123
$base.argument($reg.arg::<$t>(
124-
&$crate::to_snake_case(stringify!($name)))),
124+
&$crate::to_camel_case(stringify!($name)))),
125125
( $($rest)* ))
126126
};
127127

@@ -134,7 +134,7 @@ macro_rules! __graphql__args {
134134
$reg,
135135
$base.argument(
136136
$reg.arg::<$t>(
137-
&$crate::to_snake_case(stringify!($name)))
137+
&$crate::to_camel_case(stringify!($name)))
138138
.description($desc)),
139139
( $($rest)* ))
140140
};

‎src/macros/field.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ macro_rules! __graphql__build_field_matches {
6868
( $( ( $name:ident; ( $($args:tt)* ); $t:ty; $body:block ) )* ),
6969
) => {
7070
$(
71-
if $fieldvar == &$crate::to_snake_case(stringify!($name)) {
71+
if $fieldvar == &$crate::to_camel_case(stringify!($name)) {
7272
let result: $t = (|| {
7373
__graphql__args!(
7474
@assign_arg_vars,

‎src/macros/input_object.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ macro_rules! graphql_input_object {
4949
) => {
5050
Some($name {
5151
$( $field_name: {
52-
let n: String = $crate::to_snake_case(stringify!($field_name));
52+
let n: String = $crate::to_camel_case(stringify!($field_name));
5353
let v: Option<&&$crate::InputValue> = $var.get(&n[..]);
5454

5555
if let Some(v) = v {
@@ -84,7 +84,7 @@ macro_rules! graphql_input_object {
8484
@apply_description,
8585
$($descr)*,
8686
$reg.arg::<$field_type>(
87-
&$crate::to_snake_case(stringify!($field_name))))
87+
&$crate::to_camel_case(stringify!($field_name))))
8888
),*
8989
]
9090
};

‎src/macros/interface.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ macro_rules! graphql_interface {
100100
@apply_args,
101101
$reg,
102102
$reg.field_convert::<$t, _, Self::Context>(
103-
&$crate::to_snake_case(stringify!($name)))
103+
&$crate::to_camel_case(stringify!($name)))
104104
.description($desc)
105105
.deprecated($reason),
106106
$args));
@@ -118,7 +118,7 @@ macro_rules! graphql_interface {
118118
@apply_args,
119119
$reg,
120120
$reg.field_convert::<$t, _, Self::Context>(
121-
&$crate::to_snake_case(stringify!($name)))
121+
&$crate::to_camel_case(stringify!($name)))
122122
.deprecated($reason),
123123
$args));
124124

@@ -135,7 +135,7 @@ macro_rules! graphql_interface {
135135
@apply_args,
136136
$reg,
137137
$reg.field_convert::<$t, _, Self::Context>(
138-
&$crate::to_snake_case(stringify!($name)))
138+
&$crate::to_camel_case(stringify!($name)))
139139
.description($desc),
140140
$args));
141141

@@ -152,7 +152,7 @@ macro_rules! graphql_interface {
152152
@apply_args,
153153
$reg,
154154
$reg.field_convert::<$t, _, Self::Context>(
155-
&$crate::to_snake_case(stringify!($name))),
155+
&$crate::to_camel_case(stringify!($name))),
156156
$args));
157157

158158
graphql_interface!(@ gather_meta, ($reg, $acc, $descr), $( $rest )*);

‎src/macros/object.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ macro_rules! graphql_object {
238238
@apply_args,
239239
$reg,
240240
$reg.field_convert::<$t, _, Self::Context>(
241-
&$crate::to_snake_case(stringify!($name)))
241+
&$crate::to_camel_case(stringify!($name)))
242242
.description($desc)
243243
.deprecated($reason),
244244
$args));
@@ -256,7 +256,7 @@ macro_rules! graphql_object {
256256
@apply_args,
257257
$reg,
258258
$reg.field_convert::<$t, _, Self::Context>(
259-
&$crate::to_snake_case(stringify!($name)))
259+
&$crate::to_camel_case(stringify!($name)))
260260
.deprecated($reason),
261261
$args));
262262

@@ -273,7 +273,7 @@ macro_rules! graphql_object {
273273
@apply_args,
274274
$reg,
275275
$reg.field_convert::<$t, _, Self::Context>(
276-
&$crate::to_snake_case(stringify!($name)))
276+
&$crate::to_camel_case(stringify!($name)))
277277
.description($desc),
278278
$args));
279279

@@ -290,7 +290,7 @@ macro_rules! graphql_object {
290290
@apply_args,
291291
$reg,
292292
$reg.field_convert::<$t, _, Self::Context>(
293-
&$crate::to_snake_case(stringify!($name))),
293+
&$crate::to_camel_case(stringify!($name))),
294294
$args));
295295

296296
graphql_object!(@gather_object_meta, $reg, $acc, $descr, $ifaces, $( $rest )*);

0 commit comments

Comments
 (0)