Unverified Commit dbdf47cf authored by Leah's avatar Leah Committed by GitHub

fix build issue and future incompatibility (#47176)

It was complaining about having 2 versions of sentry for some reason
parent 723626cf
...@@ -93,15 +93,6 @@ version = "0.7.2" ...@@ -93,15 +93,6 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]]
name = "ascii-canvas"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
dependencies = [
"term",
]
[[package]] [[package]]
name = "assert-json-diff" name = "assert-json-diff"
version = "2.0.2" version = "2.0.2"
...@@ -454,17 +445,6 @@ version = "0.21.0" ...@@ -454,17 +445,6 @@ version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
[[package]]
name = "basic-cookies"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38"
dependencies = [
"lalrpop",
"lalrpop-util",
"regex",
]
[[package]] [[package]]
name = "better_scoped_tls" name = "better_scoped_tls"
version = "0.1.0" version = "0.1.0"
...@@ -495,21 +475,6 @@ dependencies = [ ...@@ -495,21 +475,6 @@ dependencies = [
"wasm-bindgen-futures", "wasm-bindgen-futures",
] ]
[[package]]
name = "bit-set"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
dependencies = [
"bit-vec",
]
[[package]]
name = "bit-vec"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.3.2" version = "1.3.2"
...@@ -1166,12 +1131,6 @@ dependencies = [ ...@@ -1166,12 +1131,6 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "crunchy"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]] [[package]]
name = "crypto-common" name = "crypto-common"
version = "0.1.6" version = "0.1.6"
...@@ -1403,16 +1362,6 @@ dependencies = [ ...@@ -1403,16 +1362,6 @@ dependencies = [
"dirs-sys", "dirs-sys",
] ]
[[package]]
name = "dirs-next"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
dependencies = [
"cfg-if 1.0.0",
"dirs-sys-next",
]
[[package]] [[package]]
name = "dirs-sys" name = "dirs-sys"
version = "0.3.7" version = "0.3.7"
...@@ -1424,17 +1373,6 @@ dependencies = [ ...@@ -1424,17 +1373,6 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "dirs-sys-next"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
dependencies = [
"libc",
"redox_users",
"winapi 0.3.9",
]
[[package]] [[package]]
name = "discard" name = "discard"
version = "1.0.4" version = "1.0.4"
...@@ -1465,15 +1403,6 @@ version = "1.8.1" ...@@ -1465,15 +1403,6 @@ version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "ena"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2e5d13ca2353ab7d0230988629def93914a8c4015f621f9b13ed2955614731d"
dependencies = [
"log",
]
[[package]] [[package]]
name = "encoding_rs" name = "encoding_rs"
version = "0.8.32" version = "0.8.32"
...@@ -2107,7 +2036,6 @@ dependencies = [ ...@@ -2107,7 +2036,6 @@ dependencies = [
"async-object-pool", "async-object-pool",
"async-trait", "async-trait",
"base64 0.13.1", "base64 0.13.1",
"basic-cookies",
"clap 4.1.8", "clap 4.1.8",
"crossbeam-utils", "crossbeam-utils",
"env_logger", "env_logger",
...@@ -2482,38 +2410,6 @@ dependencies = [ ...@@ -2482,38 +2410,6 @@ dependencies = [
"log", "log",
] ]
[[package]]
name = "lalrpop"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823"
dependencies = [
"ascii-canvas",
"atty",
"bit-set",
"diff",
"ena",
"itertools",
"lalrpop-util",
"petgraph",
"pico-args",
"regex",
"regex-syntax",
"string_cache",
"term",
"tiny-keccak",
"unicode-xid 0.2.4",
]
[[package]]
name = "lalrpop-util"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4"
dependencies = [
"regex",
]
[[package]] [[package]]
name = "lazy_static" name = "lazy_static"
version = "1.4.0" version = "1.4.0"
...@@ -3719,12 +3615,6 @@ dependencies = [ ...@@ -3719,12 +3615,6 @@ dependencies = [
"siphasher", "siphasher",
] ]
[[package]]
name = "pico-args"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
[[package]] [[package]]
name = "pin-project" name = "pin-project"
version = "1.0.12" version = "1.0.12"
...@@ -3915,7 +3805,7 @@ version = "0.4.30" ...@@ -3915,7 +3805,7 @@ version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
dependencies = [ dependencies = [
"unicode-xid 0.1.0", "unicode-xid",
] ]
[[package]] [[package]]
...@@ -6069,7 +5959,7 @@ checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" ...@@ -6069,7 +5959,7 @@ checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
dependencies = [ dependencies = [
"proc-macro2 0.4.30", "proc-macro2 0.4.30",
"quote 0.6.13", "quote 0.6.13",
"unicode-xid 0.1.0", "unicode-xid",
] ]
[[package]] [[package]]
...@@ -6108,17 +5998,6 @@ dependencies = [ ...@@ -6108,17 +5998,6 @@ dependencies = [
"windows-sys 0.42.0", "windows-sys 0.42.0",
] ]
[[package]]
name = "term"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
dependencies = [
"dirs-next",
"rustversion",
"winapi 0.3.9",
]
[[package]] [[package]]
name = "termcolor" name = "termcolor"
version = "1.2.0" version = "1.2.0"
...@@ -6330,15 +6209,6 @@ dependencies = [ ...@@ -6330,15 +6209,6 @@ dependencies = [
"syn 1.0.109", "syn 1.0.109",
] ]
[[package]]
name = "tiny-keccak"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
dependencies = [
"crunchy",
]
[[package]] [[package]]
name = "tinytemplate" name = "tinytemplate"
version = "1.2.1" version = "1.2.1"
...@@ -7259,12 +7129,6 @@ version = "0.1.0" ...@@ -7259,12 +7129,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]]
name = "unicode-xid"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]] [[package]]
name = "unsafe-libyaml" name = "unsafe-libyaml"
version = "0.2.7" version = "0.2.7"
......
...@@ -111,7 +111,7 @@ dialoguer = "0.10.3" ...@@ -111,7 +111,7 @@ dialoguer = "0.10.3"
dunce = "1.0.3" dunce = "1.0.3"
futures = "0.3.26" futures = "0.3.26"
futures-retry = "0.6.0" futures-retry = "0.6.0"
httpmock = "0.6.7" httpmock = { version = "0.6.7", default-features = false }
indexmap = "1.9.2" indexmap = "1.9.2"
indicatif = "0.17.3" indicatif = "0.17.3"
indoc = "2.0.0" indoc = "2.0.0"
......
...@@ -14,8 +14,8 @@ default = ["rustls-tls"] ...@@ -14,8 +14,8 @@ default = ["rustls-tls"]
# this is due to some of transitive dependencies have features cannot be enabled at the same time # this is due to some of transitive dependencies have features cannot be enabled at the same time
# (i.e wasmer/default vs wasmer/js-default) while cargo merges all the features at once. # (i.e wasmer/default vs wasmer/js-default) while cargo merges all the features at once.
plugin = ["next-binding/__swc_core_binding_napi_plugin", "next-swc/plugin"] plugin = ["next-binding/__swc_core_binding_napi_plugin", "next-swc/plugin"]
sentry_native_tls = ["_sentry_native_tls"] sentry_native_tls = ["sentry", "sentry/native-tls", "native-tls"]
sentry_rustls = ["_sentry_rustls"] sentry_rustls = ["sentry", "sentry/rustls", "rustls-tls"]
native-tls = ["next-binding/__turbo_native_tls"] native-tls = ["next-binding/__turbo_native_tls"]
rustls-tls = ["next-binding/__turbo_rustls_tls"] rustls-tls = ["next-binding/__turbo_rustls_tls"]
...@@ -57,12 +57,10 @@ turbo-malloc = { workspace = true } ...@@ -57,12 +57,10 @@ turbo-malloc = { workspace = true }
# allow to specify alternative (rustls) instead via features. # allow to specify alternative (rustls) instead via features.
# Note to opt in rustls default-features should be disabled # Note to opt in rustls default-features should be disabled
# (--no-default-features --features sentry_rustls) # (--no-default-features --features sentry_rustls)
_sentry_native_tls = { package = "sentry", version = "0.27.0", optional = true } sentry = { version = "0.27.0", default-features = false, features = [
_sentry_rustls = { package = "sentry", version = "0.27.0", default-features = false, features = [
"backtrace", "backtrace",
"contexts", "contexts",
"panic", "panic",
"rustls",
"reqwest", "reqwest",
], optional = true } ], optional = true }
......
...@@ -97,3 +97,9 @@ pub fn complete_output( ...@@ -97,3 +97,9 @@ pub fn complete_output(
} }
pub type ArcCompiler = Arc<Compiler>; pub type ArcCompiler = Arc<Compiler>;
#[cfg(all(feature = "native-tls", feature = "rustls-tls"))]
compile_error!("You can't enable both `native-tls` and `rustls-tls`");
#[cfg(all(not(feature = "native-tls"), not(feature = "rustls-tls")))]
compile_error!("You have to enable one of the TLS backends: `native-tls` or `rustls-tls`");
...@@ -26,7 +26,7 @@ chromiumoxide = { workspace = true, features = [ ...@@ -26,7 +26,7 @@ chromiumoxide = { workspace = true, features = [
], default-features = false } ], default-features = false }
dunce = { workspace = true } dunce = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
httpmock = { workspace = true, features = ["standalone"] } httpmock = { workspace = true, default-features = false, features = ["standalone"] }
lazy_static = { workspace = true } lazy_static = { workspace = true }
mime = { workspace = true } mime = { workspace = true }
next-core = { workspace = true } next-core = { workspace = true }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment