| 1 | Patch-Source: https://github.com/AlexanderThaller/hstdb/pull/54
|
| 2 | --
|
| 3 | From 3754ddf5aff975e193b9a40beacbbd4e09d6d1dc Mon Sep 17 00:00:00 2001
|
| 4 | From: Jakub Jirutka <[email protected]>
|
| 5 | Date: Sun, 12 Mar 2023 01:44:36 +0100
|
| 6 | Subject: [PATCH] Replace outdated pretty_env_logger with env_logger
|
| 7 |
|
| 8 | pretty_env_logger hasn't been updated for 3 years and it pulls outdated
|
| 9 | version of env_logger.
|
| 10 | ---
|
| 11 | Cargo.lock | 40 ++++++----------------------------------
|
| 12 | Cargo.toml | 2 +-
|
| 13 | src/opt.rs | 2 +-
|
| 14 | 3 files changed, 8 insertions(+), 36 deletions(-)
|
| 15 |
|
| 16 | diff --git a/Cargo.lock b/Cargo.lock
|
| 17 | index 163a042..aecf0b9 100644
|
| 18 | |
| 19 | |
| 20 | @@ -295,14 +295,11 @@ dependencies = [
|
| 21 |
|
| 22 | [[package]]
|
| 23 | name = "env_logger"
|
| 24 | -version = "0.7.1"
|
| 25 | +version = "0.10.0"
|
| 26 | source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 27 | -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
|
| 28 | +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
|
| 29 | dependencies = [
|
| 30 | - "atty",
|
| 31 | - "humantime 1.3.0",
|
| 32 | "log",
|
| 33 | - "regex",
|
| 34 | "termcolor",
|
| 35 | ]
|
| 36 |
|
| 37 | @@ -459,14 +456,14 @@ dependencies = [
|
| 38 | "csv",
|
| 39 | "ctrlc",
|
| 40 | "directories",
|
| 41 | + "env_logger",
|
| 42 | "exitcode",
|
| 43 | "flume",
|
| 44 | "glob",
|
| 45 | "hostname",
|
| 46 | - "humantime 2.1.0",
|
| 47 | + "humantime",
|
| 48 | "log",
|
| 49 | "pretty_assertions",
|
| 50 | - "pretty_env_logger",
|
| 51 | "regex",
|
| 52 | "rusqlite",
|
| 53 | "serde",
|
| 54 | @@ -477,15 +474,6 @@ dependencies = [
|
| 55 | "uuid",
|
| 56 | ]
|
| 57 |
|
| 58 | -[[package]]
|
| 59 | -name = "humantime"
|
| 60 | -version = "1.3.0"
|
| 61 | -source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 62 | -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
|
| 63 | -dependencies = [
|
| 64 | - "quick-error",
|
| 65 | -]
|
| 66 | -
|
| 67 | [[package]]
|
| 68 | name = "humantime"
|
| 69 | version = "2.1.0"
|
| 70 | @@ -534,9 +522,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
| 71 |
|
| 72 | [[package]]
|
| 73 | name = "libc"
|
| 74 | -version = "0.2.126"
|
| 75 | +version = "0.2.140"
|
| 76 | source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 77 | -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
|
| 78 | +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
|
| 79 |
|
| 80 | [[package]]
|
| 81 | name = "libsqlite3-sys"
|
| 82 | @@ -747,16 +735,6 @@ dependencies = [
|
| 83 | "output_vt100",
|
| 84 | ]
|
| 85 |
|
| 86 | -[[package]]
|
| 87 | -name = "pretty_env_logger"
|
| 88 | -version = "0.4.0"
|
| 89 | -source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 90 | -checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
|
| 91 | -dependencies = [
|
| 92 | - "env_logger",
|
| 93 | - "log",
|
| 94 | -]
|
| 95 | -
|
| 96 | [[package]]
|
| 97 | name = "proc-macro-error"
|
| 98 | version = "1.0.4"
|
| 99 | @@ -790,12 +768,6 @@ dependencies = [
|
| 100 | "unicode-ident",
|
| 101 | ]
|
| 102 |
|
| 103 | -[[package]]
|
| 104 | -name = "quick-error"
|
| 105 | -version = "1.2.3"
|
| 106 | -source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 107 | -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
| 108 | -
|
| 109 | [[package]]
|
| 110 | name = "quote"
|
| 111 | version = "1.0.20"
|
| 112 | diff --git a/Cargo.toml b/Cargo.toml
|
| 113 | index 4630e39..7eb4fa7 100644
|
| 114 | |
| 115 | |
| 116 | @@ -33,7 +33,7 @@ glob = "0.3"
|
| 117 | hostname = "0.3"
|
| 118 | humantime = "2"
|
| 119 | log = { version = "0.4", features = ["serde"] }
|
| 120 | -pretty_env_logger = "0.4"
|
| 121 | +env_logger = { version = "0.10.0", default-features = false, features = ["color"] }
|
| 122 | regex = "1"
|
| 123 | rusqlite = { version = "0.27", optional = true }
|
| 124 | serde = { version = "1", features = ["derive"] }
|
| 125 | diff --git a/src/opt.rs b/src/opt.rs
|
| 126 | index af7fb97..de1ef24 100644
|
| 127 | |
| 128 | |
| 129 | @@ -356,7 +356,7 @@ impl Opt {
|
| 130 | if std::env::var_os("RUST_LOG").is_none() {
|
| 131 | std::env::set_var("RUST_LOG", config.log_level.as_str());
|
| 132 | }
|
| 133 | - pretty_env_logger::init();
|
| 134 | + env_logger::init();
|
| 135 |
|
| 136 | sub_command.map_or_else(
|
| 137 | || {
|