Skip to content

Commit

Permalink
Update MSRV and make code more covered
Browse files Browse the repository at this point in the history
Signed-off-by: Heinz N. Gies <[email protected]>
  • Loading branch information
Licenser committed Oct 19, 2024
1 parent 1d1991f commit fc561a9
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "tremor-runtime"
readme = "README.md"
repository = "https://github.com/tremor-rs/tremor-runtime"
version = "0.13.0-rc.29"
rust-version = "1.62"
rust-version = "1.76"

[workspace]

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ Docker images are published to both [Docker Hub](https://hub.docker.com/r/tremor

We publish our images with a set of different tags as explained below

| Image tags | Explanation | Example |
| ---------- | ----------------------------------- | --------- |
| `edge` | Tracking the `main` branch | |
| `latest` | The latest release | |
| Image tags | Explanation | Example |
| ---------- | ----------------------------------- | -------- |
| `edge` | Tracking the `main` branch | |
| `latest` | The latest release | |
| `0.X.Y` | The exact release | `0.12.1` |
| `0.X` | The latest bugfix release for `0.X` | `0.12` |
| `0` | The latest minor release for `0` | `0` |
| `0.X` | The latest bugfix release for `0.X` | `0.12` |
| `0` | The latest minor release for `0` | `0` |

### Building the Docker Image

Expand Down Expand Up @@ -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.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.
For local builds, tremor requires rust 2021 (version `1.76` 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).

Expand Down
5 changes: 2 additions & 3 deletions src/system/flow_supervisor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,8 @@ impl FlowSupervisor {
}
task::spawn(async move {
while alive_flows > 0 {
if let Some(Err(e)) = rx.recv().await {
error!("Error during Draining: {e}");
};
let res = rx.recv().await.and_then(Result::err);
res.inspect(|e| error!("Error during Draining: {e}"));
alive_flows -= 1;
}
info!("Flows drained.");
Expand Down
2 changes: 1 addition & 1 deletion tremor-codec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ schema_registry_converter = { version = "4.2", default-features = false, feature
"rustls_tls",
"avro",
"easy",
]}
] }

# codecs
reqwest = { version = "0.12", default-features = false, features = [
Expand Down
2 changes: 1 addition & 1 deletion tremor-interceptor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage = "https://www.tremor.rs"
license = "Apache-2.0"
repository = "https://github.com/tremor-rs/tremor-runtime"
version = "0.13.0-rc.29"
rust-version = "1.62"
rust-version = "1.76"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 1 addition & 3 deletions tremor-interceptor/src/preprocessor/separate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,7 @@ impl Separate {
}

fn exceeds_max_length(&self, len: usize) -> bool {
self.max_length
.map(|max| max.get() < len)
.unwrap_or_default()
self.max_length.is_some_and(|max| max.get() < len)

Check warning on line 162 in tremor-interceptor/src/preprocessor/separate.rs

View check run for this annotation

Codecov / codecov/patch

tremor-interceptor/src/preprocessor/separate.rs#L162

Added line #L162 was not covered by tests
}

fn save_fragment(&mut self, v: &[u8]) -> Result<(), Error> {
Expand Down
2 changes: 1 addition & 1 deletion tremor-script-nif/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/tremor-rs/tremor-runtime"
version = "0.13.0-rc.10"
rust-version = "1.62"
rust-version = "1.76"

[lib]
name = "tremor"
Expand Down

0 comments on commit fc561a9

Please sign in to comment.