Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(toolchain): bump to nightly-2023-10-21 #12992

Merged
merged 14 commits into from
Oct 24, 2023
Merged
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ aws-smithy-types = "0.55"
aws-endpoint = "0.55"
aws-types = "0.55"
etcd-client = { package = "madsim-etcd-client", version = "0.4" }
futures-async-stream = "0.2"
futures-async-stream = "0.2.9"
hytra = "0.1"
rdkafka = { package = "madsim-rdkafka", version = "0.3.0", features = [
"cmake-build",
Expand Down Expand Up @@ -165,6 +165,8 @@ unused_must_use = "forbid"
future_incompatible = "warn"
nonstandard_style = "warn"
rust_2018_idioms = "warn"
# Backward compatibility is not important for an application.
async_fn_in_trait = "allow"

[workspace.lints.clippy]
uninlined_format_args = "allow"
Expand Down
2 changes: 1 addition & 1 deletion ci/build-ci-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cat ../rust-toolchain
# !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! #
# AND ALSO docker-compose.yml #
######################################################
export BUILD_ENV_VERSION=v20230919
export BUILD_ENV_VERSION=v20231022

export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}"

Expand Down
10 changes: 5 additions & 5 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ services:
retries: 5

source-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230919
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231022
depends_on:
- mysql
- db
Expand All @@ -81,7 +81,7 @@ services:
- ..:/risingwave

sink-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230919
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231022
depends_on:
- mysql
- db
Expand All @@ -92,12 +92,12 @@ services:
- ..:/risingwave

rw-build-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230919
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231022
volumes:
- ..:/risingwave

ci-flamegraph-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230919
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231022
# NOTE(kwannoel): This is used in order to permit
# syscalls for `nperf` (perf_event_open),
# so it can do CPU profiling.
Expand All @@ -108,7 +108,7 @@ services:
- ..:/risingwave

regress-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230919
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231022
depends_on:
db:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion ci/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly-2023-09-09"
channel = "nightly-2023-10-21"
4 changes: 1 addition & 3 deletions src/batch/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#![feature(exact_size_is_empty)]
#![feature(type_alias_impl_trait)]
#![cfg_attr(coverage, feature(no_coverage))]
#![feature(generators)]
#![feature(coroutines)]
#![feature(proc_macro_hygiene, stmt_expr_attributes)]
#![feature(iterator_try_collect)]
#![feature(lint_reasons)]
Expand All @@ -27,13 +27,11 @@
#![feature(let_chains)]
#![feature(bound_map)]
#![feature(int_roundings)]
#![feature(async_fn_in_trait)]
#![feature(allocator_api)]
#![feature(impl_trait_in_assoc_type)]
#![feature(result_option_inspect)]
#![feature(assert_matches)]
#![feature(lazy_cell)]
#![feature(return_position_impl_trait_in_trait)]

mod error;
pub mod exchange_source;
Expand Down
4 changes: 1 addition & 3 deletions src/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@
#![feature(trusted_len)]
#![feature(allocator_api)]
#![feature(lint_reasons)]
#![feature(generators)]
#![feature(coroutines)]
#![feature(map_try_insert)]
#![feature(lazy_cell)]
#![feature(error_generic_member_access)]
#![feature(let_chains)]
#![feature(return_position_impl_trait_in_trait)]
#![feature(portable_simd)]
#![feature(array_chunks)]
#![feature(inline_const_pat)]
Expand All @@ -43,7 +42,6 @@
#![feature(result_option_inspect)]
#![feature(map_entry_replace)]
#![feature(negative_impls)]
#![feature(async_fn_in_trait)]
#![feature(bound_map)]
#![feature(array_methods)]

Expand Down
2 changes: 1 addition & 1 deletion src/common/src/types/ordered.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ impl<T: DefaultOrd> From<T> for DefaultOrdered<T> {
}
}

#[allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
#[allow(clippy::non_canonical_partial_ord_impl)]
impl<T: DefaultOrd> PartialOrd for DefaultOrdered<T> {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
self.0.default_partial_cmp(other.as_inner())
Expand Down
2 changes: 1 addition & 1 deletion src/compute/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

#![feature(trait_alias)]
#![feature(generators)]
#![feature(coroutines)]
#![feature(type_alias_impl_trait)]
#![feature(let_chains)]
#![feature(result_option_inspect)]
Expand Down
2 changes: 1 addition & 1 deletion src/compute/tests/cdc_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

#![feature(let_chains)]
#![feature(generators)]
#![feature(coroutines)]

use std::sync::atomic::AtomicU64;
use std::sync::Arc;
Expand Down
2 changes: 1 addition & 1 deletion src/compute/tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#![feature(generators)]
#![feature(coroutines)]
#![feature(proc_macro_hygiene, stmt_expr_attributes)]

use std::sync::atomic::AtomicU64;
Expand Down
6 changes: 2 additions & 4 deletions src/connector/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#![expect(dead_code)]
#![allow(clippy::derive_partial_eq_without_eq)]
#![feature(generators)]
#![feature(coroutines)]
#![feature(proc_macro_hygiene)]
#![feature(stmt_expr_attributes)]
#![feature(box_patterns)]
Expand All @@ -25,11 +25,9 @@
#![feature(let_chains)]
#![feature(box_into_inner)]
#![feature(type_alias_impl_trait)]
#![feature(return_position_impl_trait_in_trait)]
#![feature(async_fn_in_trait)]
#![feature(associated_type_defaults)]
#![feature(impl_trait_in_assoc_type)]
#![feature(iter_from_generator)]
#![feature(iter_from_coroutine)]
#![feature(if_let_guard)]
#![feature(iterator_try_collect)]

Expand Down
2 changes: 1 addition & 1 deletion src/connector/src/sink/formatter/append_only.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl<KE: RowEncoder, VE: RowEncoder> SinkFormatter for AppendOnlyFormatter<KE, V
&self,
chunk: &StreamChunk,
) -> impl Iterator<Item = Result<(Option<Self::K>, Option<Self::V>)>> {
std::iter::from_generator(|| {
std::iter::from_coroutine(|| {
for (op, row) in chunk.rows() {
if op != Op::Insert {
continue;
Expand Down
2 changes: 1 addition & 1 deletion src/connector/src/sink/formatter/debezium_json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ impl SinkFormatter for DebeziumJsonFormatter {
&self,
chunk: &StreamChunk,
) -> impl Iterator<Item = Result<(Option<Value>, Option<Value>)>> {
std::iter::from_generator(|| {
std::iter::from_coroutine(|| {
let DebeziumJsonFormatter {
schema,
pk_indices,
Expand Down
2 changes: 1 addition & 1 deletion src/connector/src/sink/formatter/upsert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl<KE: RowEncoder, VE: RowEncoder> SinkFormatter for UpsertFormatter<KE, VE> {
&self,
chunk: &StreamChunk,
) -> impl Iterator<Item = Result<(Option<Self::K>, Option<Self::V>)>> {
std::iter::from_generator(|| {
std::iter::from_coroutine(|| {
for (op, row) in chunk.rows() {
let event_key_object = Some(tri!(self.key_encoder.encode(row)));

Expand Down
2 changes: 1 addition & 1 deletion src/expr/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#![feature(lint_reasons)]
#![feature(iterator_try_collect)]
#![feature(lazy_cell)]
#![feature(generators)]
#![feature(coroutines)]
#![feature(arc_unwrap_or_clone)]
#![feature(never_type)]

Expand Down
2 changes: 1 addition & 1 deletion src/expr/impl/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#![feature(exclusive_range_pattern)]
#![feature(lazy_cell)]
#![feature(round_ties_even)]
#![feature(generators)]
#![feature(coroutines)]
#![feature(test)]
#![feature(arc_unwrap_or_clone)]

Expand Down
14 changes: 7 additions & 7 deletions src/frontend/src/binder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,13 @@ impl Binder {
}
}

/// The column name stored in [`BindContext`] for a column without an alias.
pub const UNNAMED_COLUMN: &str = "?column?";
/// The table name stored in [`BindContext`] for a subquery without an alias.
const UNNAMED_SUBQUERY: &str = "?subquery?";
/// The table name stored in [`BindContext`] for a column group.
const COLUMN_GROUP_PREFIX: &str = "?column_group_id?";

#[cfg(test)]
pub mod test_utils {
use risingwave_common::types::DataType;
Expand All @@ -380,10 +387,3 @@ pub mod test_utils {
Binder::new_with_param_types(&SessionImpl::mock(), param_types)
}
}

/// The column name stored in [`BindContext`] for a column without an alias.
pub const UNNAMED_COLUMN: &str = "?column?";
/// The table name stored in [`BindContext`] for a subquery without an alias.
const UNNAMED_SUBQUERY: &str = "?subquery?";
/// The table name stored in [`BindContext`] for a column group.
const COLUMN_GROUP_PREFIX: &str = "?column_group_id?";
3 changes: 1 addition & 2 deletions src/frontend/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#![allow(clippy::derive_partial_eq_without_eq)]
#![feature(map_try_insert)]
#![feature(negative_impls)]
#![feature(generators)]
#![feature(coroutines)]
#![feature(proc_macro_hygiene, stmt_expr_attributes)]
#![feature(trait_alias)]
#![feature(extract_if)]
Expand All @@ -32,7 +32,6 @@
#![feature(extend_one)]
#![feature(type_alias_impl_trait)]
#![feature(impl_trait_in_assoc_type)]
#![feature(async_fn_in_trait)]
#![feature(result_flattening)]
#![recursion_limit = "256"]

Expand Down
1 change: 0 additions & 1 deletion src/meta/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#![feature(is_sorted)]
#![feature(impl_trait_in_assoc_type)]
#![feature(type_name_of_val)]
#![feature(async_fn_in_trait)]

pub mod backup_restore;
pub mod barrier;
Expand Down
2 changes: 1 addition & 1 deletion src/rpc_client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#![feature(result_option_inspect)]
#![feature(type_alias_impl_trait)]
#![feature(associated_type_defaults)]
#![feature(generators)]
#![feature(coroutines)]
#![feature(iterator_try_collect)]
#![feature(hash_extract_if)]
#![feature(try_blocks)]
Expand Down
2 changes: 1 addition & 1 deletion src/source/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#![feature(trait_alias)]
#![feature(lint_reasons)]
#![feature(result_option_inspect)]
#![feature(generators)]
#![feature(coroutines)]
#![feature(hash_extract_if)]
#![feature(type_alias_impl_trait)]
#![feature(box_patterns)]
Expand Down
4 changes: 2 additions & 2 deletions src/storage/hummock_test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bytes = { version = "1" }
clap = { version = "4", features = ["derive"] }
fail = "0.5"
futures = { version = "0.3", default-features = false, features = ["alloc"] }
futures-async-stream = "0.2"
futures-async-stream = "0.2.9"
itertools = "0.11"
parking_lot = "0.12"
rand = "0.8"
Expand All @@ -47,7 +47,7 @@ futures = { version = "0.3", default-features = false, features = [
"executor",
] }

futures-async-stream = "0.2"
futures-async-stream = "0.2.9"
risingwave_test_runner = { workspace = true }
serial_test = "2.0"
sync-point = { path = "../../utils/sync-point" }
Expand Down
2 changes: 1 addition & 1 deletion src/storage/hummock_test/src/bin/replay/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

#![feature(bound_map)]
#![feature(generators)]
#![feature(coroutines)]
#![feature(stmt_expr_attributes)]
#![feature(proc_macro_hygiene)]

Expand Down
1 change: 0 additions & 1 deletion src/storage/hummock_test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#![feature(bound_map)]
#![feature(type_alias_impl_trait)]
#![feature(associated_type_bounds)]
#![feature(return_position_impl_trait_in_trait)]

#[cfg(test)]
mod compactor_tests;
Expand Down
2 changes: 1 addition & 1 deletion src/storage/hummock_trace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ bincode = { version = "=2.0.0-rc.3", features = ["serde"] }
byteorder = "1"
bytes = { version = "1", features = ["serde"] }
futures = { version = "0.3", default-features = false, features = ["alloc"] }
futures-async-stream = "0.2"
futures-async-stream = "0.2.9"
parking_lot = "0.12"
prost = { workspace = true }
risingwave_common = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/storage/hummock_trace/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#![feature(cursor_remaining)]
#![feature(bound_map)]
#![feature(trait_alias)]
#![feature(generators)]
#![feature(coroutines)]

mod collector;
mod error;
Expand Down
3 changes: 0 additions & 3 deletions src/storage/src/hummock/compactor/compactor_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,6 @@ impl CompactorRunner {
Ok((self.split_index, ssts, compaction_stat))
}

// This is a clippy bug, see https://github.com/rust-lang/rust-clippy/issues/11380.
// TODO: remove `allow` here after the issued is closed.
#[expect(clippy::needless_pass_by_ref_mut)]
pub async fn build_delete_range_iter<F: CompactionFilter>(
sstable_infos: &Vec<SstableInfo>,
sstable_store: &SstableStoreRef,
Expand Down
3 changes: 0 additions & 3 deletions src/storage/src/hummock/event_handler/uploader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1641,9 +1641,6 @@ mod tests {
(buffer_tracker, uploader, new_task_notifier)
}

// This is a clippy bug, see https://github.com/rust-lang/rust-clippy/issues/11380.
// TODO: remove `allow` here after the issued is closed.
#[expect(clippy::needless_pass_by_ref_mut)]
async fn assert_uploader_pending(uploader: &mut HummockUploader) {
for _ in 0..10 {
yield_now().await;
Expand Down
Loading
Loading