Skip to content

Commit ba1eef2

Browse files
committed
chore(volo-thrift): fix clippy warning needless_as_bytes
https://rust-lang.github.io/rust-clippy/master/index.html#needless_as_bytes ``` error: needless call to `as_bytes()` --> volo-thrift/src/codec/default/ttheader.rs:389:37 | 389 | dst.put_u16(TT_HEADER_BIZ_STATUS_KEY.as_bytes().len() as u16); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: `len()` can be called directly on strings: `TT_HEADER_BIZ_STATUS_KEY.len()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_as_bytes = note: `-D clippy::needless-as-bytes` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::needless_as_bytes)]` ``` Signed-off-by: Yu Li <liyu.yukiteru@bytedance.com>
1 parent 5d85c3d commit ba1eef2

File tree

2 files changed

+23
-26
lines changed

2 files changed

+23
-26
lines changed

scripts/volo-cli-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ quiet() {
99
}
1010

1111
echo_command() {
12-
echo "\`$@\`"
12+
echo "$@"
1313

1414
if [ "${GITHUB_ACTIONS:-}" = "true" ] || [ -n "${DEBUG:-}" ]; then
1515
# If we are in GitHub Actions or env `DEBUG` is non-empty,

volo-thrift/src/codec/default/ttheader.rs

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,13 @@ pub(crate) fn encode<Cx: ThriftContext>(
386386
if let Some(biz_error) = cx.stats().biz_error() {
387387
let mut ibuf = itoa::Buffer::new();
388388
let status_code = ibuf.format(biz_error.status_code);
389-
dst.put_u16(TT_HEADER_BIZ_STATUS_KEY.as_bytes().len() as u16);
389+
dst.put_u16(TT_HEADER_BIZ_STATUS_KEY.len() as u16);
390390
dst.put_slice(TT_HEADER_BIZ_STATUS_KEY.as_bytes());
391391
dst.put_u16(status_code.len() as u16);
392392
dst.put_slice(status_code.as_bytes());
393393
string_kv_len += 1;
394394

395-
dst.put_u16(TT_HEADER_BIZ_MESSAGE_KEY.as_bytes().len() as u16);
395+
dst.put_u16(TT_HEADER_BIZ_MESSAGE_KEY.len() as u16);
396396
dst.put_slice(TT_HEADER_BIZ_MESSAGE_KEY.as_bytes());
397397
dst.put_u16(biz_error.status_message.len() as u16);
398398
dst.put_slice(biz_error.status_message.as_bytes());
@@ -408,9 +408,9 @@ pub(crate) fn encode<Cx: ThriftContext>(
408408
.expect("encode biz error extra")
409409
.into()
410410
};
411-
dst.put_u16(TT_HEADER_BIZ_EXTRA_KEY.as_bytes().len() as u16);
411+
dst.put_u16(TT_HEADER_BIZ_EXTRA_KEY.len() as u16);
412412
dst.put_slice(TT_HEADER_BIZ_EXTRA_KEY.as_bytes());
413-
dst.put_u16(extra_str.as_bytes().len() as u16);
413+
dst.put_u16(extra_str.len() as u16);
414414
dst.put_slice(extra_str.as_bytes());
415415
string_kv_len += 1;
416416
}
@@ -600,7 +600,7 @@ pub(crate) fn encode_size<Cx: ThriftContext>(cx: &mut Cx) -> Result<usize, Thrif
600600
len += 2;
601601
len += key_len;
602602
len += 2;
603-
len += value.as_bytes().len();
603+
len += value.len();
604604
}
605605
}
606606
if let Some(at) = metainfo.get_all_transients() {
@@ -609,7 +609,7 @@ pub(crate) fn encode_size<Cx: ThriftContext>(cx: &mut Cx) -> Result<usize, Thrif
609609
len += 2;
610610
len += key_len;
611611
len += 2;
612-
len += value.as_bytes().len();
612+
len += value.len();
613613
}
614614
}
615615
}
@@ -620,36 +620,33 @@ pub(crate) fn encode_size<Cx: ThriftContext>(cx: &mut Cx) -> Result<usize, Thrif
620620
len += 2;
621621
len += key_len;
622622
len += 2;
623-
len += value.as_bytes().len();
623+
len += value.len();
624624
}
625625
}
626626
if thrift_cx.encode_conn_reset() {
627627
len += 2;
628-
len += "crrst".as_bytes().len();
628+
len += "crrst".len();
629629
len += 2;
630-
len += "1".as_bytes().len();
630+
len += "1".len();
631631
}
632632
if let Some(biz_error) = thrift_cx.stats().biz_error() {
633633
len += 2;
634-
len += TT_HEADER_BIZ_STATUS_KEY.as_bytes().len();
634+
len += TT_HEADER_BIZ_STATUS_KEY.len();
635635
len += 2;
636-
len += itoa::Buffer::new()
637-
.format(biz_error.status_code)
638-
.as_bytes()
639-
.len();
636+
len += itoa::Buffer::new().format(biz_error.status_code).len();
640637

641638
len += 2;
642-
len += TT_HEADER_BIZ_MESSAGE_KEY.as_bytes().len();
639+
len += TT_HEADER_BIZ_MESSAGE_KEY.len();
643640
len += 2;
644-
len += biz_error.status_message.as_bytes().len();
641+
len += biz_error.status_message.len();
645642

646643
if let Some(extra) = &biz_error.extra {
647644
len += 2;
648-
len += TT_HEADER_BIZ_EXTRA_KEY.as_bytes().len();
645+
len += TT_HEADER_BIZ_EXTRA_KEY.len();
649646
len += 2;
650647
let extra =
651648
sonic_rs::to_string(&extra).expect("encode biz error extra");
652-
len += extra.as_bytes().len();
649+
len += extra.len();
653650
thrift_cx
654651
.extensions_mut()
655652
.insert(BizErrorExtra(extra.into()));
@@ -676,48 +673,48 @@ pub(crate) fn encode_size<Cx: ThriftContext>(cx: &mut Cx) -> Result<usize, Thrif
676673
// WithHeader
677674
len += 2;
678675
len += 2;
679-
len += "3".as_bytes().len();
676+
len += "3".len();
680677

681678
// Config
682679
let config = thrift_cx.rpc_info().config();
683680
if let Some(timeout) = config.rpc_timeout() {
684681
let timeout = timeout.as_millis().to_string();
685682
len += 2;
686683
len += 2;
687-
len += timeout.as_bytes().len();
684+
len += timeout.len();
688685
}
689686

690687
if let Some(timeout) = config.connect_timeout() {
691688
let timeout = timeout.as_millis().to_string();
692689
len += 2;
693690
len += 2;
694-
len += timeout.as_bytes().len();
691+
len += timeout.len();
695692
}
696693

697694
// Caller
698695
let caller = thrift_cx.rpc_info().caller();
699696
let svc = caller.service_name();
700697
len += 2;
701698
len += 2;
702-
len += svc.as_bytes().len();
699+
len += svc.len();
703700

704701
// Callee
705702
let callee = thrift_cx.rpc_info().callee();
706703
let method = thrift_cx.rpc_info().method();
707704
len += 2;
708705
len += 2;
709-
len += method.as_bytes().len();
706+
len += method.len();
710707

711708
let svc = callee.service_name();
712709
len += 2;
713710
len += 2;
714-
len += svc.as_bytes().len();
711+
len += svc.len();
715712

716713
if let Some(addr) = callee.address() {
717714
let addr = addr.to_string();
718715
len += 2;
719716
len += 2;
720-
len += addr.as_bytes().len();
717+
len += addr.len();
721718
}
722719
}
723720
};

0 commit comments

Comments
 (0)