Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"libxcb",
"libxkbcommon",
"logviewer",
"pkill",
"xfixes"
]
}
2 changes: 1 addition & 1 deletion Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "log_viewer"
version = "0.3.0"
version = "0.3.1"
edition = "2021"

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

# web:
[target.'cfg(target_arch = "wasm32")'.dependencies]
Expand Down
7 changes: 1 addition & 6 deletions bacon.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
# This is a configuration file for the bacon tool
#
# Complete help on configuration: https://dystroy.org/bacon/config/
#
#  You may check the current default at
# https://github.com/Canop/bacon/blob/main/defaults/default-bacon.toml

[jobs.reset-settings-and-run]
command = [
"sh",
"-c",
"./scripts/remove_settings_and_run_with_default.sh",
"trash ~/.local/share/logviewer/app.ron; cargo run",
]
need_stdout = true
allow_warnings = true
Expand Down
11 changes: 0 additions & 11 deletions scripts/remove_settings_and_run_with_default.sh

This file was deleted.

2 changes: 1 addition & 1 deletion src/app/data_display_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl Default for DataDisplayOptions {
.into_iter()
.map(String::from)
.collect(),
emphasize_if_matching_field_idx: Some(2),
emphasize_if_matching_field_idx: Some(3),
row_idx_field_name: Some("row#".to_string()),
row_parse_error_handling: Default::default(),
level_conversion: Some(Default::default()),
Expand Down
Loading