1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
Index: cargo/Cargo.toml
===================================================================
--- cargo.orig/Cargo.toml
+++ cargo/Cargo.toml
@@ -329,9 +329,6 @@ default-features = false
version = "=0.10.57"
optional = true
-[target.'cfg(target_has_atomic = "64")'.dependencies.tracing-chrome]
-version = "0.7.2"
-
[target.'cfg(target_os = "linux")'.dependencies.cargo-credential-libsecret]
version = "0.4.7"
Index: cargo/src/bin/cargo/main.rs
===================================================================
--- cargo.orig/src/bin/cargo/main.rs
+++ cargo/src/bin/cargo/main.rs
@@ -83,6 +83,7 @@ fn setup_logger() -> Option<ChromeFlushG
profile_guard
}
+/* Debian: disabled, not yet packaged tracing-chrome
#[cfg(target_has_atomic = "64")]
type ChromeFlushGuard = tracing_chrome::FlushGuard;
#[cfg(target_has_atomic = "64")]
@@ -109,10 +110,9 @@ where
(None, None)
}
}
+*/
-#[cfg(not(target_has_atomic = "64"))]
type ChromeFlushGuard = ();
-#[cfg(not(target_has_atomic = "64"))]
fn chrome_layer() -> (
Option<tracing_subscriber::layer::Identity>,
Option<ChromeFlushGuard>,
@@ -120,7 +120,7 @@ fn chrome_layer() -> (
(None, None)
}
-#[cfg(target_has_atomic = "64")]
+#[allow(dead_code)]
fn env_to_bool(os: Option<&OsStr>) -> bool {
match os.and_then(|os| os.to_str()) {
Some("1") | Some("true") => true,
|
