Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
ximper-welcome
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
ximper-welcome
Commits
1acb7db4
Commit
1acb7db4
authored
Feb 19, 2024
by
Sophie Herold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
logging: Replace env_logger_pretty with env_logger
Over time env_logger also got pretty output and env_logger_pretty depends on an (outdated) version of env_logger anyways.
parent
384582e4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
80 additions
and
84 deletions
+80
-84
Cargo.lock
Cargo.lock
+76
-80
Cargo.toml
Cargo.toml
+3
-3
main.rs
src/main.rs
+1
-1
No files found.
Cargo.lock
View file @
1acb7db4
...
@@ -12,6 +12,54 @@ dependencies = [
...
@@ -12,6 +12,54 @@ dependencies = [
]
]
[[package]]
[[package]]
name = "anstream"
version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
[[package]]
name = "anstyle-parse"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
dependencies = [
"windows-sys",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
"windows-sys",
]
[[package]]
name = "anyhow"
name = "anyhow"
version = "1.0.79"
version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -79,16 +127,32 @@ dependencies = [
...
@@ -79,16 +127,32 @@ dependencies = [
]
]
[[package]]
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "env_filter"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
dependencies = [
"log",
"regex",
]
[[package]]
name = "env_logger"
name = "env_logger"
version = "0.1
0
.2"
version = "0.1
1
.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580
"
checksum = "
6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d
"
dependencies = [
dependencies = [
"anstream",
"anstyle",
"env_filter",
"humantime",
"humantime",
"is-terminal",
"log",
"log",
"regex",
"termcolor",
]
]
[[package]]
[[package]]
...
@@ -98,16 +162,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -98,16 +162,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
[[package]]
name = "errno"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
dependencies = [
"libc",
"windows-sys",
]
[[package]]
name = "field-offset"
name = "field-offset"
version = "0.3.6"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -337,11 +391,11 @@ dependencies = [
...
@@ -337,11 +391,11 @@ dependencies = [
name = "gnome-tour"
name = "gnome-tour"
version = "45.0.0"
version = "45.0.0"
dependencies = [
dependencies = [
"env_logger",
"gettext-rs",
"gettext-rs",
"gtk4",
"gtk4",
"libadwaita",
"libadwaita",
"log",
"log",
"pretty_env_logger",
"regex",
"regex",
]
]
...
@@ -477,12 +531,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -477,12 +531,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
[[package]]
name = "hermit-abi"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
[[package]]
name = "humantime"
name = "humantime"
version = "2.1.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -499,17 +547,6 @@ dependencies = [
...
@@ -499,17 +547,6 @@ dependencies = [
]
]
[[package]]
[[package]]
name = "is-terminal"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
dependencies = [
"hermit-abi",
"rustix",
"windows-sys",
]
[[package]]
name = "lazy_static"
name = "lazy_static"
version = "1.4.0"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -554,12 +591,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -554,12 +591,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
[[package]]
name = "linux-raw-sys"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
[[package]]
name = "locale_config"
name = "locale_config"
version = "0.3.0"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -674,16 +705,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -674,16 +705,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
[[package]]
[[package]]
name = "pretty_env_logger"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
dependencies = [
"env_logger",
"log",
]
[[package]]
name = "proc-macro-crate"
name = "proc-macro-crate"
version = "3.1.0"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -773,19 +794,6 @@ dependencies = [
...
@@ -773,19 +794,6 @@ dependencies = [
]
]
[[package]]
[[package]]
name = "rustix"
version = "0.38.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
dependencies = [
"bitflags",
"errno",
"libc",
"linux-raw-sys",
"windows-sys",
]
[[package]]
name = "semver"
name = "semver"
version = "1.0.21"
version = "1.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -883,15 +891,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -883,15 +891,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6"
checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6"
[[package]]
[[package]]
name = "termcolor"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
dependencies = [
"winapi-util",
]
[[package]]
name = "thiserror"
name = "thiserror"
version = "1.0.56"
version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -952,6 +951,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -952,6 +951,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "version-compare"
name = "version-compare"
version = "0.1.1"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -980,15 +985,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
...
@@ -980,15 +985,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
[[package]]
name = "winapi-util"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
dependencies = [
"winapi",
]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
...
...
Cargo.toml
View file @
1acb7db4
...
@@ -6,9 +6,9 @@ edition = "2021"
...
@@ -6,9 +6,9 @@ edition = "2021"
[dependencies]
[dependencies]
gtk
=
{
package
=
"gtk4"
,
version
=
"0.8"
,
features
=
["gnome_45"]
}
gtk
=
{
package
=
"gtk4"
,
version
=
"0.8"
,
features
=
["gnome_45"]
}
log
=
"0.4"
log
=
"0.4"
gettext-rs
=
{
version
=
"0.7"
,
features
=
["gettext-system"]
}
gettext-rs
=
{
version
=
"0.7"
,
features
=
["gettext-system"]
}
adw
=
{
package
=
"libadwaita"
,
version
=
"0.6"
}
adw
=
{
package
=
"libadwaita"
,
version
=
"0.6"
}
pretty_env_logger
=
"0.5
"
env_logger
=
"0.11
"
regex
=
"1.5"
regex
=
"1.5"
src/main.rs
View file @
1acb7db4
...
@@ -10,7 +10,7 @@ use application::Application;
...
@@ -10,7 +10,7 @@ use application::Application;
use
config
::{
GETTEXT_PACKAGE
,
LOCALEDIR
};
use
config
::{
GETTEXT_PACKAGE
,
LOCALEDIR
};
fn
main
()
->
glib
::
ExitCode
{
fn
main
()
->
glib
::
ExitCode
{
pretty_
env_logger
::
init
();
env_logger
::
init
();
// Prepare i18n
// Prepare i18n
setlocale
(
LocaleCategory
::
LcAll
,
""
);
setlocale
(
LocaleCategory
::
LcAll
,
""
);
bindtextdomain
(
GETTEXT_PACKAGE
,
LOCALEDIR
)
bindtextdomain
(
GETTEXT_PACKAGE
,
LOCALEDIR
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment