Skip to content
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

Upgrade to reqwest 0.12 / hyper 1.x #76

Merged
merged 3 commits into from
Jul 13, 2024
Merged

Upgrade to reqwest 0.12 / hyper 1.x #76

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
0ad9001
Upgrade reqwest: 0.11 → 0.12
dbrgn Jul 13, 2024
9a246ee
Remove unused import in example
dbrgn Jul 13, 2024
f3e789f
Implement clippy suggestion
dbrgn Jul 13, 2024
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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ data-encoding = "2.1"
form_urlencoded = { version = "1", optional = true }
hmac = "0.12.1"
log = "0.4"
reqwest = { version = "0.11", features = ["rustls-tls-native-roots", "multipart"], default-features = false }
reqwest = { version = "0.12", features = ["rustls-tls-native-roots", "multipart"], default-features = false }
rand = "0.8.5"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/send_e2e_image.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::path::Path;
use std::process;

use docopt::Docopt;
use threema_gateway::{ApiBuilder, RecipientKey};
use threema_gateway::ApiBuilder;

const USAGE: &str = "
Usage: send_e2e_image [options] <from> <to> <secret> <private-key> <path-to-jpegfile>
Expand Down
5 changes: 1 addition & 4 deletions src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,7 @@ pub(crate) async fn send_e2e(
log::debug!("Sending e2e encrypted message from {} to {}", from, to);

// Prepare POST data
let mut params = match additional_params {
Some(p) => p,
None => HashMap::new(),
};
let mut params = additional_params.unwrap_or_default();
params.insert("from".into(), from.into());
params.insert("to".into(), to.into());
params.insert("secret".into(), secret.into());
Expand Down