Skip to content

Commit e69ed7a

Browse files
Eric Fuxxchanmergify[bot]
authored
fix: fix clippy options (rustflags) (#5667)
* fix the config.toml * fix a little dashboard issue by the way * fix Co-authored-by: xxchan <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 1178dbe commit e69ed7a

File tree

4 files changed

+39
-2
lines changed

4 files changed

+39
-2
lines changed

.cargo/config.toml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,24 @@ rustflags = [
66
"-Ctarget-feature=+avx2",
77
"--cfg",
88
"tokio_unstable",
9+
# lints
10+
# TODO: use lint configuration in cargo https://github.com/rust-lang/cargo/issues/5034
11+
"-Funused_must_use",
12+
"-Wclippy::dbg_macro",
13+
"-Wclippy::disallowed_methods",
14+
"-Wclippy::disallowed_types",
15+
"-Wclippy::doc_markdown",
16+
"-Wclippy::explicit_into_iter_loop",
17+
"-Wclippy::explicit_iter_loop",
18+
"-Wclippy::inconsistent_struct_constructor",
19+
"-Wclippy::unused_async",
20+
"-Wclippy::map_flatten",
21+
"-Wclippy::no_effect_underscore_binding",
22+
"-Wclippy::await_holding_lock",
23+
"-Wrustdoc::broken_intra_doc_links",
24+
"-Wfuture_incompatible",
25+
"-Wnonstandard_style",
26+
"-Wrust_2018_idioms",
927
]
1028

1129
# Remove "-Ctarget-feature=+neon" if your aarch64 target does not support NEON vector extensions
@@ -16,6 +34,24 @@ rustflags = [
1634
"-Ctarget-feature=+neon",
1735
"--cfg",
1836
"tokio_unstable",
37+
# lints
38+
# TODO: use lint configuration in cargo https://github.com/rust-lang/cargo/issues/5034
39+
"-Funused_must_use",
40+
"-Wclippy::dbg_macro",
41+
"-Wclippy::disallowed_methods",
42+
"-Wclippy::disallowed_types",
43+
"-Wclippy::doc_markdown",
44+
"-Wclippy::explicit_into_iter_loop",
45+
"-Wclippy::explicit_iter_loop",
46+
"-Wclippy::inconsistent_struct_constructor",
47+
"-Wclippy::unused_async",
48+
"-Wclippy::map_flatten",
49+
"-Wclippy::no_effect_underscore_binding",
50+
"-Wclippy::await_holding_lock",
51+
"-Wrustdoc::broken_intra_doc_links",
52+
"-Wfuture_incompatible",
53+
"-Wnonstandard_style",
54+
"-Wrust_2018_idioms",
1955
]
2056

2157
[build]

dashboard/lib/streamPlan/parser.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ class StreamNode extends Node {
8585
"union",
8686
"deltaIndexJoin",
8787
"expand",
88+
"groupTopN",
8889
])
8990
for (let [type, _] of Object.entries(nodeProto)) {
9091
if (types.has(type)) {

src/meta/src/dashboard/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ <h1 class="flex-auto leading-6 font-semibold text-sky-500 dark:text-sky-400">
127127
let currentMvs = new Set
128128
let showAssociateMv = false
129129

130-
const types = new Set(["dynamicFilter", "source", "sink", "project", "projectSet", "filter", "materialize", "localSimpleAgg", "globalSimpleAgg", "hashAgg", "appendOnlyTopN", "hashJoin", "topN", "hopWindow", "merge", "exchange", "chain", "batchPlan", "lookup", "arrange", "lookupUnion", "union", "deltaIndexJoin", "expand"]);
130+
const types = new Set(["dynamicFilter", "source", "sink", "project", "projectSet", "filter", "materialize", "localSimpleAgg", "globalSimpleAgg", "hashAgg", "appendOnlyTopN", "hashJoin", "topN", "hopWindow", "merge", "exchange", "chain", "batchPlan", "lookup", "arrange", "lookupUnion", "union", "deltaIndexJoin", "expand", "groupTopN"]);
131131

132132
const cluster = (type, cluster) => `
133133
<div class="p-6 max-w bg-white rounded-xl shadow-md flex flex-col space-y-1">

src/storage/src/hummock/file_cache/store.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ where
301301
Ok(())
302302
}
303303

304-
pub fn start_batch_writer(&self, item_capacity: usize) -> StoreBatchWriter<K, V> {
304+
pub fn start_batch_writer(&self, item_capacity: usize) -> StoreBatchWriter<'_, K, V> {
305305
StoreBatchWriter::new(self, self.block_size, self.buffer_capacity, item_capacity)
306306
}
307307

0 commit comments

Comments
 (0)