Update to rust 1.62

Signed-off-by: Heinz N. Gies <[email protected]>

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.61-bullseye as builder
+FROM rust:1.62-bullseye as builder
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive

Dockerfile.learn

@@ -1,4 +1,4 @@
-FROM rust:1.61-bullseye as builder
+FROM rust:1.62-bullseye as builder
 
 RUN cargo install --features=ssl websocat
 

Dockerfile.native

@@ -1,4 +1,4 @@
-FROM rust:1.61-bullseye as builder
+FROM rust:1.62-bullseye as builder
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive

README.md

@@ -158,7 +158,7 @@ docker exec -it fa7e3b4cec86 sh
 
 If you are not comfortable with managing library packages on your system or don't have experience with, please use the Docker image provided above. 
 
-For local builds, tremor requires rust 2021 (version `1.61` or later), along with all the tools needed to build rust programs. Eg: for CentOS, the packages `gcc`, `make`, `cmake`, `clang`, `openssl`, and `libstdc++` are required. For different distributions or operating systems, please install the packages accordingly.
+For local builds, tremor requires rust 2021 (version `1.62` or later), along with all the tools needed to build rust programs. Eg: for CentOS, the packages `gcc`, `make`, `cmake`, `clang`, `openssl`, and `libstdc++` are required. For different distributions or operating systems, please install the packages accordingly.
 **NOTE** AVX2, SSE4.2 or NEON are needed to build [simd-json](https://github.com/simd-lite/simd-json#cpu-target) used by tremor. So if you are building in vm, check which processor instruction are passed to it. Like `lscpu | grep Flags`
 For a more detailed guide on local builds, please refer to the [tremor development docs](https://www.tremor.rs/community/development/quick-start).
 

rust-toolchain

@@ -1 +1 @@
-1.61.0
+1.62.0

tremor-cli/src/errors.rs

@@ -49,6 +49,7 @@ error_chain! {
         YamlError(serde_yaml::Error) #[doc = "Error during yaml parsing"];
         JsonError(simd_json::Error) #[doc = "Error during json parsing"];
         Io(std::io::Error) #[doc = "Error during std::io"];
+        Fmt(std::fmt::Error) #[doc = "Error during std::fmt"];
         FutureTimeoutError(async_std::future::TimeoutError) #[doc = "Error waiting for futures to complete"];
         Globwalk(globwalk::GlobError) #[doc = "Glob walker error"];
         SendError(std::sync::mpsc::SendError<String>);

tremor-cli/src/test/unit.rs

@@ -12,12 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use super::TestConfig;
 use crate::errors::{Error, Result};
 use crate::test;
 use crate::test::stats;
 use crate::test::status;
 use crate::{env, report};
 use report::TestSuite;
+use std::fmt::Write as _; // import without risk of name clashing
 use std::io::Read;
 use std::{collections::HashMap, path::Path};
 use test::tag;
@@ -31,8 +33,6 @@ use tremor_script::{
     NO_AGGRS,
 };
 use tremor_script::{ctx::EventContext, NO_CONSTS};
-
-use super::TestConfig;
 const EXEC_OPTS: ExecOpts = ExecOpts {
     result_needed: true,
     aggr: AggrType::Tick,
@@ -150,7 +150,7 @@ fn eval_suite_tests(
                 let success = if let Some(success) = value.as_bool() {
                     success
                 } else if let Some([expected, got]) = value.as_array().map(Vec::as_slice) {
-                    info.push_str(&format!("{} != {}", expected, got));
+                    write!(info, "{expected} != {got}")?;
                     false
                 } else {
                     false

tremor-influx/src/lib.rs

@@ -38,6 +38,8 @@
     clippy::unnecessary_unwrap,
     clippy::pedantic
 )]
+// TODO: remove this when https://github.com/rust-lang/rust-clippy/issues/9076 is fixed
+#![allow(clippy::trait_duplication_in_bounds)]
 
 mod decoder;
 mod encoder;

tremor-pipeline/src/macros.rs

@@ -23,20 +23,20 @@ macro_rules! op {
     ($factory:ident ($uid:ident, $node:ident) $constructor:block) => {
         #[derive(Default)]
         pub struct $factory {}
-        impl crate::op::InitializableOperator for $factory {
+        impl $crate::op::InitializableOperator for $factory {
             fn node_to_operator(
                 &self,
                 $uid: tremor_common::ids::OperatorId,
-                $node: &crate::NodeConfig,
-            ) -> crate::errors::Result<Box<dyn crate::op::Operator>> {
+                $node: &$crate::NodeConfig,
+            ) -> $crate::errors::Result<Box<dyn $crate::op::Operator>> {
                 $constructor
             }
         }
         impl $factory {
             fn new() -> Self {
                 Self {}
             }
-            pub fn new_boxed() -> Box<dyn crate::op::InitializableOperator> {
+            pub fn new_boxed() -> Box<dyn $crate::op::InitializableOperator> {
                 Box::new(Self::new())
             }
         }

tremor-script/src/ast/base_expr.rs

@@ -34,7 +34,7 @@ macro_rules! impl_expr_exraw {
             <Ex as Upable<'script>>::Target: Expression + 'script,
             Ex: ExpressionRaw<'script> + 'script,
         {
-            fn meta(&self) -> &crate::ast::NodeMeta {
+            fn meta(&self) -> &$crate::ast::NodeMeta {
                 &self.mid
             }
         }
@@ -47,7 +47,7 @@ macro_rules! impl_expr_exraw {
 macro_rules! impl_expr_no_lt {
     ($name:ident) => {
         impl BaseExpr for $name {
-            fn meta(&self) -> &crate::ast::NodeMeta {
+            fn meta(&self) -> &$crate::ast::NodeMeta {
                 &self.mid
             }
         }

tremor-script/src/ast/node_id.rs

@@ -110,7 +110,7 @@ pub trait BaseRef {
 #[macro_export]
 macro_rules! impl_fqn {
     ($struct:ident) => {
-        impl crate::ast::node_id::BaseRef for $struct<'_> {
+        impl $crate::ast::node_id::BaseRef for $struct<'_> {
             fn fqn(&self) -> String {
                 self.node_id.fqn()
             }

tremor-script/src/lexer.rs

@@ -70,11 +70,11 @@ fn is_test_start(ch: char) -> bool {
 }
 
 fn is_dec_digit(ch: char) -> bool {
-    ch.is_digit(10)
+    ch.is_ascii_digit()
 }
 
 fn is_hex(ch: char) -> bool {
-    ch.is_digit(16)
+    ch.is_ascii_hexdigit()
 }
 
 pub(crate) fn ident_to_token(ident: &str) -> Token {

tremor-script/src/lib.rs

@@ -22,6 +22,8 @@
     clippy::unnecessary_unwrap,
     clippy::pedantic
 )]
+// TODO: remove this when https://github.com/rust-lang/rust-clippy/issues/9076 is fixed
+#![allow(clippy::trait_duplication_in_bounds)]
 
 #[cfg(test)]
 #[macro_use]

tremor-value/src/lib.rs

@@ -5,9 +5,13 @@
     clippy::unnecessary_unwrap,
     clippy::pedantic
 )]
+#![deny(missing_docs)]
 // We might want to revisit inline_always
 #![allow(clippy::module_name_repetitions, clippy::inline_always)]
-#![deny(missing_docs)]
+// TODO: remove this when https://github.com/rust-lang/rust-clippy/issues/9076 is fixed
+#![allow(clippy::trait_duplication_in_bounds)]
+// TODO: remove this when https://github.com/rust-lang/rust-clippy/issues/8772 is fixed
+#![allow(clippy::type_repetition_in_bounds)]
 // Copyright 2020-2021, The Tremor Team
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

tremor-value/src/value.rs

@@ -312,10 +312,10 @@ impl<'value> Value<'value> {
     /// Tries to get an element of an object as bytes
     #[inline]
     #[must_use]
-    pub fn get_bytes<Q: ?Sized>(&self, k: &Q) -> Option<&[u8]>
+    pub fn get_bytes<Q>(&self, k: &Q) -> Option<&[u8]>
     where
         Cow<'value, str>: Borrow<Q> + Hash + Eq,
-        Q: Hash + Eq + Ord,
+        Q: Hash + Eq + Ord + ?Sized,
     {
         self.get(k).and_then(Self::as_bytes)
     }
@@ -341,10 +341,10 @@ impl<'value> Value<'value> {
     /// is a string
     #[inline]
     #[must_use]
-    pub fn get_char<Q: ?Sized>(&self, k: &Q) -> Option<char>
+    pub fn get_char<Q>(&self, k: &Q) -> Option<char>
     where
         Cow<'value, str>: Borrow<Q> + Hash + Eq,
-        Q: Hash + Eq + Ord,
+        Q: Hash + Eq + Ord + ?Sized,
     {
         self.get(k).and_then(Self::as_char)
     }