Merge branch 'docsrs' into 'main'

sporksmith · sporksmith · commit 01de78a1a472 · 2024-08-07T15:47:09.000Z
Don't need to tell docs.rs to enable `docsrs` cfg. It does it automatically as of rust-lang/docs.rs#2390 (comment) While this change isn't in our MSRV yet, we were only using this when building for docs.rs, where we use the latest anyway. See merge request tpo/core/arti!2308
diff --git a/crates/arti-bench/Cargo.toml b/crates/arti-bench/Cargo.toml
@@ -37,4 +37,3 @@ tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
 full = ["arti/full", "arti-client/full", "fs-mistrust/full", "tor-config/full", "tor-rtcompat/full"]
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/arti-client/Cargo.toml b/crates/arti-client/Cargo.toml
@@ -177,4 +177,3 @@ tracing-subscriber = "0.3.0"
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/arti-config/Cargo.toml b/crates/arti-config/Cargo.toml
@@ -13,7 +13,6 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 publish = false
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 
diff --git a/crates/arti-relay/Cargo.toml b/crates/arti-relay/Cargo.toml
@@ -21,4 +21,3 @@ full = []
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/arti-rpc-client-core/Cargo.toml b/crates/arti-rpc-client-core/Cargo.toml
@@ -36,4 +36,3 @@ ffi = ["c_str_macro", "paste"]
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/arti-testing/Cargo.toml b/crates/arti-testing/Cargo.toml
@@ -45,4 +45,3 @@ tracing = "0.1.36"
 tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/arti/Cargo.toml b/crates/arti/Cargo.toml
@@ -148,4 +148,3 @@ trycmd = "0.15.4"
 winapi = { version = "0.3.8", features = ["winerror"] }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/caret/Cargo.toml b/crates/caret/Cargo.toml
@@ -17,4 +17,3 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 full = []
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/fs-mistrust/Cargo.toml b/crates/fs-mistrust/Cargo.toml
@@ -38,4 +38,3 @@ tempfile = "3"
 toml = "0.8.8"
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/fslock-guard/Cargo.toml b/crates/fslock-guard/Cargo.toml
@@ -27,4 +27,3 @@ version = "^0.3.8"
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/retry-error/Cargo.toml b/crates/retry-error/Cargo.toml
@@ -23,4 +23,3 @@ thiserror = "1"
 full = []
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/safelog/Cargo.toml b/crates/safelog/Cargo.toml
@@ -29,4 +29,3 @@ serial_test = "3.0.0"
 static_assertions = "1"
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-basic-utils/Cargo.toml b/crates/tor-basic-utils/Cargo.toml
@@ -33,4 +33,3 @@ full = []
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-bytes/Cargo.toml b/crates/tor-bytes/Cargo.toml
@@ -30,4 +30,3 @@ getrandom = { version = "0.2.3", features = ["js"] }
 full = ["tor-error/full", "tor-llcrypto/full"]
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-cell/Cargo.toml b/crates/tor-cell/Cargo.toml
@@ -61,4 +61,3 @@ hex = "0.4"
 hex-literal = "0.4"
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-cert/Cargo.toml b/crates/tor-cert/Cargo.toml
@@ -35,4 +35,3 @@ humantime = "2"
 rand = "0.8"
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-chanmgr/Cargo.toml b/crates/tor-chanmgr/Cargo.toml
@@ -76,4 +76,3 @@ tor-rtcompat = { path = "../tor-rtcompat", version = "0.21.0", features = ["toki
 tor-rtmock = { path = "../tor-rtmock", version = "0.21.0" }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-checkable/Cargo.toml b/crates/tor-checkable/Cargo.toml
@@ -24,6 +24,5 @@ thiserror = "1"
 tor-llcrypto = { path = "../tor-llcrypto", version = "0.21.0" }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
 [dev-dependencies]
 humantime = "2"
diff --git a/crates/tor-circmgr/Cargo.toml b/crates/tor-circmgr/Cargo.toml
@@ -108,4 +108,3 @@ tor-rtcompat = { path = "../tor-rtcompat", version = "0.21.0", features = ["toki
 tor-rtmock = { path = "../tor-rtmock", version = "0.21.0" }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-config/Cargo.toml b/crates/tor-config/Cargo.toml
@@ -58,4 +58,3 @@ tempfile = "3"
 tracing-test = "0.2.4"
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-congestion/Cargo.toml b/crates/tor-congestion/Cargo.toml
@@ -24,4 +24,3 @@ tor-units = { path = "../tor-units", version = "0.21.0" }
 full = ["tor-error/full", "tor-netdir/full", "tor-units/full"]
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-consdiff/Cargo.toml b/crates/tor-consdiff/Cargo.toml
@@ -26,4 +26,3 @@ thiserror = "1"
 tor-llcrypto = { path = "../tor-llcrypto", version = "0.21.0" }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-dirclient/Cargo.toml b/crates/tor-dirclient/Cargo.toml
@@ -71,4 +71,3 @@ tor-rtcompat = { path = "../tor-rtcompat", version = "0.21.0", features = ["toki
 tor-rtmock = { path = "../tor-rtmock", version = "0.21.0" }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-dirmgr/Cargo.toml b/crates/tor-dirmgr/Cargo.toml
@@ -114,4 +114,3 @@ tor-rtmock = { path = "../tor-rtmock", version = "0.21.0" }
 tracing-test = "0.2.4"
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-error/Cargo.toml b/crates/tor-error/Cargo.toml
@@ -42,4 +42,3 @@ tracing-test = "0.2.4"
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-events/Cargo.toml b/crates/tor-events/Cargo.toml
@@ -29,4 +29,3 @@ tokio = { version = "1.7", features = ["macros", "rt", "rt-multi-thread", "time"
 full = []
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-guardmgr/Cargo.toml b/crates/tor-guardmgr/Cargo.toml
@@ -100,4 +100,3 @@ tor-rtmock = { path = "../tor-rtmock", version = "0.21.0" }
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-keymgr/Cargo.toml b/crates/tor-keymgr/Cargo.toml
@@ -66,4 +66,3 @@ tor-basic-utils = { path = "../tor-basic-utils", version = "0.21.0" }
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-linkspec/Cargo.toml b/crates/tor-linkspec/Cargo.toml
@@ -56,4 +56,3 @@ serde_test = "1.0.124"
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-llcrypto/Cargo.toml b/crates/tor-llcrypto/Cargo.toml
@@ -72,4 +72,3 @@ tor-basic-utils = { path = "../tor-basic-utils", version = "0.21.0" }
 getrandom = { version = "0.2.3", features = ["js"] }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-netdir/Cargo.toml b/crates/tor-netdir/Cargo.toml
@@ -80,4 +80,3 @@ hex-literal = "0.4"
 tor-netdoc = { path = "../tor-netdoc", version = "0.21.0", features = ["build_docs"] }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-netdoc/Cargo.toml b/crates/tor-netdoc/Cargo.toml
@@ -129,4 +129,3 @@ tor-basic-utils = { version = "0.21.0", path = "../tor-basic-utils" }
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-persist/Cargo.toml b/crates/tor-persist/Cargo.toml
@@ -56,4 +56,3 @@ tracing-test = "0.2.4"
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-proto/Cargo.toml b/crates/tor-proto/Cargo.toml
@@ -104,4 +104,3 @@ tokio-crate = { package = "tokio", version = "1.7", features = ["full"] }
 tor-rtcompat = { path = "../tor-rtcompat", version = "0.21.0", features = ["tokio", "native-tls"] }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-protover/Cargo.toml b/crates/tor-protover/Cargo.toml
@@ -19,4 +19,3 @@ thiserror = "1"
 full = ["caret/full"]
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-relay-selection/Cargo.toml b/crates/tor-relay-selection/Cargo.toml
@@ -45,4 +45,3 @@ tor-netdoc = { path = "../tor-netdoc", version = "0.21.0", features = ["testing"
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-rtcompat/Cargo.toml b/crates/tor-rtcompat/Cargo.toml
@@ -67,4 +67,3 @@ x509-signature = { version = "0.5.0", optional = true }
 native-tls-crate = { package = "native-tls", version = "0.2" }
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-rtmock/Cargo.toml b/crates/tor-rtmock/Cargo.toml
@@ -43,4 +43,3 @@ tor-rtcompat = { path = "../tor-rtcompat", version = "0.21.0", features = ["toki
 full = ["tor-rtcompat/full", "tor-error/full", "tor-async-utils/full"]
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-socksproto/Cargo.toml b/crates/tor-socksproto/Cargo.toml
@@ -31,4 +31,3 @@ tor-error = { path = "../tor-error", version = "0.21.0" }
 hex-literal = "0.4"
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/crates/tor-units/Cargo.toml b/crates/tor-units/Cargo.toml
@@ -27,4 +27,3 @@ full = []
 # features = ["from"]
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]

Original file line number	Diff line number	Diff line change
`@@ -177,4 +177,3 @@ tracing-subscriber = "0.3.0"`
`177`	`177`
`178`	`178`	`[package.metadata.docs.rs]`
`179`	`179`	`all-features = true`
`180`		`-rustdoc-args = ["--cfg", "docsrs"]`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,3 @@ full = []`
`21`	`21`
`22`	`22`	`[package.metadata.docs.rs]`
`23`	`23`	`all-features = true`
`24`		`-rustdoc-args = ["--cfg", "docsrs"]`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,3 @@ ffi = ["c_str_macro", "paste"]`
`36`	`36`
`37`	`37`	`[package.metadata.docs.rs]`
`38`	`38`	`all-features = true`
`39`		`-rustdoc-args = ["--cfg", "docsrs"]`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,3 @@ version = "^0.3.8"`
`27`	`27`
`28`	`28`	`[package.metadata.docs.rs]`
`29`	`29`	`all-features = true`
`30`		`-rustdoc-args = ["--cfg", "docsrs"]`