Skip to content

Commit 3a449be

Browse files
authored
Merge pull request #4 from c-git/develop
0.3.1
2 parents 2c95860 + 92a3604 commit 3a449be

File tree

6 files changed

+6
-21
lines changed

6 files changed

+6
-21
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"libxcb",
77
"libxkbcommon",
88
"logviewer",
9+
"pkill",
910
"xfixes"
1011
]
1112
}

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "log_viewer"
3-
version = "0.3.0"
3+
version = "0.3.1"
44
edition = "2021"
55

66
[dependencies]
@@ -25,7 +25,7 @@ serde_json = "1.0.134"
2525
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
2626
env_logger = "0.11.6"
2727
poll-promise = { version = "0.3.0", features = ["tokio"] }
28-
tokio = { version = "1.35.1", features = ["full"] }
28+
tokio = { version = "1.35.1", features = ["full"] } # TODO 2: Reduce features of tokio to only those needed
2929

3030
# web:
3131
[target.'cfg(target_arch = "wasm32")'.dependencies]

bacon.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
# This is a configuration file for the bacon tool
2-
#
3-
# Complete help on configuration: https://dystroy.org/bacon/config/
4-
#
5-
#  You may check the current default at
6-
# https://github.com/Canop/bacon/blob/main/defaults/default-bacon.toml
72

83
[jobs.reset-settings-and-run]
94
command = [
105
"sh",
116
"-c",
12-
"./scripts/remove_settings_and_run_with_default.sh",
7+
"trash ~/.local/share/logviewer/app.ron; cargo run",
138
]
149
need_stdout = true
1510
allow_warnings = true

scripts/remove_settings_and_run_with_default.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/app/data_display_options.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl Default for DataDisplayOptions {
9595
.into_iter()
9696
.map(String::from)
9797
.collect(),
98-
emphasize_if_matching_field_idx: Some(2),
98+
emphasize_if_matching_field_idx: Some(3),
9999
row_idx_field_name: Some("row#".to_string()),
100100
row_parse_error_handling: Default::default(),
101101
level_conversion: Some(Default::default()),

0 commit comments

Comments
 (0)