Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion ci/build-ci-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export RUST_TOOLCHAIN=$(cat ../rust-toolchain)
# !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! #
# AND ALSO docker-compose.yml #
######################################################
export BUILD_ENV_VERSION=v20220826
export BUILD_ENV_VERSION=v20220905

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

Expand Down
4 changes: 2 additions & 2 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ services:
retries: 5

rw-build-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20220826
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20220905
volumes:
- ..:/risingwave

regress-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20220826
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20220905
depends_on:
db:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2022-07-29
nightly-2022-09-05
4 changes: 3 additions & 1 deletion src/common/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,9 @@ impl Debug for RwError {
"{}\n{}",
self.inner,
// Use inner error's backtrace by default, otherwise use the generated one in `From`.
self.inner.backtrace().unwrap_or(&*self.backtrace)
(&self.inner as &dyn std::error::Error)
.request_ref::<Backtrace>()
.unwrap_or(&*self.backtrace)
)
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#![feature(generic_associated_types)]
#![feature(binary_heap_drain_sorted)]
#![feature(is_sorted)]
#![feature(backtrace)]
#![feature(fn_traits)]
#![feature(type_alias_impl_trait)]
#![feature(test)]
Expand All @@ -39,6 +38,9 @@
#![feature(lint_reasons)]
#![feature(generators)]
#![feature(map_try_insert)]
#![feature(let_chains)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]

#[macro_use]
pub mod error;
Expand Down
1 change: 0 additions & 1 deletion src/expr/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#![feature(binary_heap_drain_sorted)]
#![feature(binary_heap_into_iter_sorted)]
#![feature(is_sorted)]
#![feature(backtrace)]
#![feature(fn_traits)]
#![feature(assert_matches)]
#![feature(let_else)]
Expand Down
4 changes: 3 additions & 1 deletion src/object_store/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#![feature(backtrace)]
#![feature(generic_associated_types)]
#![feature(trait_alias)]
#![feature(type_alias_impl_trait)]
#![feature(let_chains)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]

extern crate core;

Expand Down
2 changes: 1 addition & 1 deletion src/object_store/src/object/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ impl std::fmt::Debug for ObjectError {

write!(f, "{}", self.inner)?;
writeln!(f)?;
if let Some(backtrace) = self.inner.backtrace() {
if let Some(backtrace) = (&self.inner as &dyn Error).request_ref::<Backtrace>() {
write!(f, " backtrace of inner error:\n{}", backtrace)?;
} else {
write!(f, " backtrace of `ObjectError`:\n{}", self.backtrace)?;
Expand Down
2 changes: 1 addition & 1 deletion src/risedevtool/src/bin/risedev-config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ fn main() -> Result<()> {
if component == "RISEDEV_CONFIGURED" {
continue;
}
match Components::from_env(&component) {
match Components::from_env(component) {
Some(component) => {
if val == "true" {
enabled.push(component);
Expand Down
1 change: 1 addition & 0 deletions src/risedevtool/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#![allow(clippy::derive_partial_eq_without_eq)]
#![feature(exit_status_error)]
#![feature(let_else)]
#![feature(let_chains)]
#![feature(lint_reasons)]

mod config;
Expand Down
6 changes: 3 additions & 3 deletions src/sqlparser/src/tokenizer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ impl Token {
Token::Word(Word {
value: word.to_string(),
quote_style,
keyword: if quote_style == None {
keyword: if quote_style.is_none() {
let keyword = ALL_KEYWORDS.binary_search(&word_uppercase.as_str());
keyword.map_or(Keyword::NoKeyword, |x| ALL_KEYWORDS_INDEX[x])
} else {
Expand Down Expand Up @@ -330,8 +330,8 @@ impl<'a> Tokenizer<'a> {
}

Token::Whitespace(Whitespace::Tab) => self.col += 4,
Token::Word(w) if w.quote_style == None => self.col += w.value.len() as u64,
Token::Word(w) if w.quote_style != None => self.col += w.value.len() as u64 + 2,
Token::Word(w) if w.quote_style.is_none() => self.col += w.value.len() as u64,
Token::Word(w) if w.quote_style.is_some() => self.col += w.value.len() as u64 + 2,
Token::Number(s) => self.col += s.len() as u64,
Token::SingleQuotedString(s) => self.col += s.len() as u64,
_ => self.col += 1,
Expand Down
3 changes: 2 additions & 1 deletion src/storage/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,12 @@ impl From<StorageError> for RwError {

impl std::fmt::Debug for StorageError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
use std::backtrace::Backtrace;
use std::error::Error;

write!(f, "{}", self)?;
writeln!(f)?;
if let Some(backtrace) = self.backtrace() {
if let Some(backtrace) = (&self as &dyn Error).request_ref::<Backtrace>() {
// Since we forward all backtraces from source, `self.backtrace()` is the backtrace of
// inner error.
write!(f, " backtrace of inner error:\n{}", backtrace)?;
Expand Down
2 changes: 1 addition & 1 deletion src/storage/src/hummock/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ impl std::fmt::Debug for HummockError {

write!(f, "{}", self.inner)?;
writeln!(f)?;
if let Some(backtrace) = self.inner.backtrace() {
if let Some(backtrace) = (&self.inner as &dyn Error).request_ref::<Backtrace>() {
write!(f, " backtrace of inner error:\n{}", backtrace)?;
} else {
write!(
Expand Down
4 changes: 3 additions & 1 deletion src/storage/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#![deny(unused_must_use)]
#![deny(rustdoc::broken_intra_doc_links)]
#![feature(allocator_api)]
#![feature(backtrace)]
#![feature(binary_heap_drain_sorted)]
#![feature(bound_as_ref)]
#![feature(bound_map)]
Expand All @@ -36,6 +35,7 @@
#![feature(generic_associated_types)]
#![feature(hash_drain_filter)]
#![feature(let_else)]
#![feature(let_chains)]
#![feature(lint_reasons)]
#![feature(map_first_last)]
#![feature(proc_macro_hygiene)]
Expand All @@ -50,6 +50,8 @@
#![feature(assert_matches)]
#![feature(is_sorted)]
#![feature(btree_drain_filter)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]

pub mod hummock;
pub mod keyspace;
Expand Down
5 changes: 0 additions & 5 deletions src/utils/async_stack_trace/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// FIXME: This is a false-positive clippy test, remove this while bumping toolchain.
// https://github.com/tokio-rs/tokio/issues/4836
// https://github.com/rust-lang/rust-clippy/issues/8493
#![expect(clippy::declare_interior_mutable_const)]

use std::cell::RefCell;
use std::fmt::{Debug, Write};
use std::sync::atomic::{AtomicU64, Ordering};
Expand Down