diff options
| author | Rutger Broekhoff | 2024-01-24 18:29:52 +0100 |
|---|---|---|
| committer | Rutger Broekhoff | 2024-01-24 18:29:52 +0100 |
| commit | edf27e8ed7ccca8ee87fef6e65790bb58982c74a (patch) | |
| tree | 5c0fe8a25b00aa8e5de0eebdd2d09b572d60974e | |
| parent | 54035ca467789b6218008b3d94c4aa40214a3a35 (diff) | |
| download | gitolfs3-edf27e8ed7ccca8ee87fef6e65790bb58982c74a.tar.gz gitolfs3-edf27e8ed7ccca8ee87fef6e65790bb58982c74a.zip | |
ok so that breaks it
| -rw-r--r-- | rs/Cargo.lock | 60 | ||||
| -rw-r--r-- | rs/server/Cargo.toml | 1 | ||||
| -rw-r--r-- | rs/server/src/main.rs | 1 |
3 files changed, 1 insertions, 61 deletions
diff --git a/rs/Cargo.lock b/rs/Cargo.lock index d5a8108..f3beb9e 100644 --- a/rs/Cargo.lock +++ b/rs/Cargo.lock | |||
| @@ -53,17 +53,6 @@ dependencies = [ | |||
| 53 | ] | 53 | ] |
| 54 | 54 | ||
| 55 | [[package]] | 55 | [[package]] |
| 56 | name = "atty" | ||
| 57 | version = "0.2.14" | ||
| 58 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 59 | checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" | ||
| 60 | dependencies = [ | ||
| 61 | "hermit-abi 0.1.19", | ||
| 62 | "libc", | ||
| 63 | "winapi", | ||
| 64 | ] | ||
| 65 | |||
| 66 | [[package]] | ||
| 67 | name = "autocfg" | 56 | name = "autocfg" |
| 68 | version = "1.1.0" | 57 | version = "1.1.0" |
| 69 | source = "registry+https://github.com/rust-lang/crates.io-index" | 58 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -774,19 +763,6 @@ dependencies = [ | |||
| 774 | ] | 763 | ] |
| 775 | 764 | ||
| 776 | [[package]] | 765 | [[package]] |
| 777 | name = "env_logger" | ||
| 778 | version = "0.9.3" | ||
| 779 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 780 | checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" | ||
| 781 | dependencies = [ | ||
| 782 | "atty", | ||
| 783 | "humantime", | ||
| 784 | "log", | ||
| 785 | "regex", | ||
| 786 | "termcolor", | ||
| 787 | ] | ||
| 788 | |||
| 789 | [[package]] | ||
| 790 | name = "equivalent" | 766 | name = "equivalent" |
| 791 | version = "1.0.1" | 767 | version = "1.0.1" |
| 792 | source = "registry+https://github.com/rust-lang/crates.io-index" | 768 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -954,15 +930,6 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" | |||
| 954 | 930 | ||
| 955 | [[package]] | 931 | [[package]] |
| 956 | name = "hermit-abi" | 932 | name = "hermit-abi" |
| 957 | version = "0.1.19" | ||
| 958 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 959 | checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" | ||
| 960 | dependencies = [ | ||
| 961 | "libc", | ||
| 962 | ] | ||
| 963 | |||
| 964 | [[package]] | ||
| 965 | name = "hermit-abi" | ||
| 966 | version = "0.3.3" | 933 | version = "0.3.3" |
| 967 | source = "registry+https://github.com/rust-lang/crates.io-index" | 934 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 968 | checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" | 935 | checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" |
| @@ -1057,12 +1024,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 1057 | checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" | 1024 | checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" |
| 1058 | 1025 | ||
| 1059 | [[package]] | 1026 | [[package]] |
| 1060 | name = "humantime" | ||
| 1061 | version = "2.1.0" | ||
| 1062 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1063 | checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" | ||
| 1064 | |||
| 1065 | [[package]] | ||
| 1066 | name = "hyper" | 1027 | name = "hyper" |
| 1067 | version = "0.14.28" | 1028 | version = "0.14.28" |
| 1068 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1029 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -1317,7 +1278,7 @@ version = "1.16.0" | |||
| 1317 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1278 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1318 | checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" | 1279 | checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" |
| 1319 | dependencies = [ | 1280 | dependencies = [ |
| 1320 | "hermit-abi 0.3.3", | 1281 | "hermit-abi", |
| 1321 | "libc", | 1282 | "libc", |
| 1322 | ] | 1283 | ] |
| 1323 | 1284 | ||
| @@ -1754,7 +1715,6 @@ dependencies = [ | |||
| 1754 | "base64", | 1715 | "base64", |
| 1755 | "chrono", | 1716 | "chrono", |
| 1756 | "common", | 1717 | "common", |
| 1757 | "env_logger", | ||
| 1758 | "mime", | 1718 | "mime", |
| 1759 | "serde", | 1719 | "serde", |
| 1760 | "serde_json", | 1720 | "serde_json", |
| @@ -1883,15 +1843,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 1883 | checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" | 1843 | checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" |
| 1884 | 1844 | ||
| 1885 | [[package]] | 1845 | [[package]] |
| 1886 | name = "termcolor" | ||
| 1887 | version = "1.4.1" | ||
| 1888 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1889 | checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" | ||
| 1890 | dependencies = [ | ||
| 1891 | "winapi-util", | ||
| 1892 | ] | ||
| 1893 | |||
| 1894 | [[package]] | ||
| 1895 | name = "thread_local" | 1846 | name = "thread_local" |
| 1896 | version = "1.1.7" | 1847 | version = "1.1.7" |
| 1897 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1848 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -2254,15 +2205,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 2254 | checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" | 2205 | checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" |
| 2255 | 2206 | ||
| 2256 | [[package]] | 2207 | [[package]] |
| 2257 | name = "winapi-util" | ||
| 2258 | version = "0.1.6" | ||
| 2259 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2260 | checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" | ||
| 2261 | dependencies = [ | ||
| 2262 | "winapi", | ||
| 2263 | ] | ||
| 2264 | |||
| 2265 | [[package]] | ||
| 2266 | name = "winapi-x86_64-pc-windows-gnu" | 2208 | name = "winapi-x86_64-pc-windows-gnu" |
| 2267 | version = "0.4.0" | 2209 | version = "0.4.0" |
| 2268 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2210 | source = "registry+https://github.com/rust-lang/crates.io-index" |
diff --git a/rs/server/Cargo.toml b/rs/server/Cargo.toml index 0572cac..edb76d8 100644 --- a/rs/server/Cargo.toml +++ b/rs/server/Cargo.toml | |||
| @@ -10,7 +10,6 @@ axum = "0.7" | |||
| 10 | base64 = "0.21" | 10 | base64 = "0.21" |
| 11 | chrono = { version = "0.4", features = ["serde"] } | 11 | chrono = { version = "0.4", features = ["serde"] } |
| 12 | common = { path = "../common" } | 12 | common = { path = "../common" } |
| 13 | env_logger = "0.9.0" | ||
| 14 | mime = "0.3" | 13 | mime = "0.3" |
| 15 | serde = { version = "1", features = ["derive"] } | 14 | serde = { version = "1", features = ["derive"] } |
| 16 | serde_json = "1" | 15 | serde_json = "1" |
diff --git a/rs/server/src/main.rs b/rs/server/src/main.rs index e816dde..b346bc6 100644 --- a/rs/server/src/main.rs +++ b/rs/server/src/main.rs | |||
| @@ -160,7 +160,6 @@ fn get_s3_client(env: &Env) -> Result<aws_sdk_s3::Client, std::io::Error> { | |||
| 160 | 160 | ||
| 161 | #[tokio::main] | 161 | #[tokio::main] |
| 162 | async fn main() -> ExitCode { | 162 | async fn main() -> ExitCode { |
| 163 | env_logger::init(); | ||
| 164 | tracing_subscriber::fmt::init(); | 163 | tracing_subscriber::fmt::init(); |
| 165 | 164 | ||
| 166 | let env = match Env::load() { | 165 | let env = match Env::load() { |