Skip to content

Upgrade to tokio 1.0 and reqwest 0.11 #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 7, 2021
Merged

Upgrade to tokio 1.0 and reqwest 0.11 #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4f6d08
Upgrade to `tokio 1.0` and `reqwest 0.11`
jtgeibel Jan 5, 2021
f9df15c
Bump the MSRV to 1.45.0
jtgeibel Jan 6, 2021
41f066f
Fix an unnecessary mut warning
jtgeibel Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
rust: [1.42.0]
rust: [1.45.0]

name: checkfast/testfast using ${{ matrix.rust }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ best API and adding new features.
We currently only verify this crate against a recent version of Sentry hosted on [sentry.io](https://sentry.io/) but it
should work with on-prem Sentry versions 8.20 and later.

Additionally, the lowest Rust version we target is _1.42.0_.
Additionally, the lowest Rust version we target is _1.45.0_.

## Resources

Expand Down
2 changes: 1 addition & 1 deletion sentry-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ log_ = { package = "log", version = "0.4.8", optional = true, features = ["std"]
sentry = { version = "0.21.0", path = "../sentry", default-features = false, features = ["test"] }
thiserror = "1.0.15"
anyhow = "1.0.30"
tokio = { version = "0.2", features = ["rt-core", "macros"] }
tokio = { version = "1.0", features = ["rt", "macros"] }
2 changes: 1 addition & 1 deletion sentry-core/src/futures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ mod tests {
#[test]
fn test_futures() {
let mut events = with_captured_events(|| {
let mut runtime = Runtime::new().unwrap();
let runtime = Runtime::new().unwrap();

// spawn two separate tasks, and await them in the end.
runtime.block_on(async {
Expand Down
4 changes: 2 additions & 2 deletions sentry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ sentry-log = { version = "0.21.0", path = "../sentry-log", optional = true }
sentry-panic = { version = "0.21.0", path = "../sentry-panic", optional = true }
sentry-slog = { version = "0.21.0", path = "../sentry-slog", optional = true }
log_ = { package = "log", version = "0.4.8", optional = true, features = ["std"] }
reqwest_ = { package = "reqwest", version = "0.10.8", optional = true, features = ["blocking", "json"], default-features = false }
reqwest_ = { package = "reqwest", version = "0.11", optional = true, features = ["blocking", "json"], default-features = false }
curl_ = { package = "curl", version = "0.4.25", optional = true }
surf_ = { package = "surf", version = "2.0.0", optional = true }
futures = { version = "0.3", optional = true }
Expand All @@ -62,6 +62,6 @@ sentry-slog = { version = "0.21.0", path = "../sentry-slog" }
log_ = { package = "log", version = "0.4.8", features = ["std"] }
slog_ = { package = "slog", version = "2.5.2" }
actix-web = { version = "3", default-features = false }
tokio = { version = "0.2", features = ["macros"] }
tokio = { version = "1.0", features = ["macros"] }
pretty_env_logger = "0.4.0"
anyhow_ = { package = "anyhow", version = "1.0.30" }