From 5d0d9cd8c46401f08ceab738c568783d0713b1ea Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 17 Jan 2024 15:01:57 +0100 Subject: [PATCH 1/2] Update to ehttp 0.4 --- Cargo.lock | 4 ++-- crates/egui_demo_app/Cargo.toml | 2 +- crates/egui_extras/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77b1c3463f2..11cbd30656b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1333,9 +1333,9 @@ dependencies = [ [[package]] name = "ehttp" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88f45662356f96afc7d9e2bc9910ad8352ee01417f7c69b8b16a53c8767a75d" +checksum = "e598cc2bfc28612f26426259ed99a978270e9433d63ae6d2843e30fb0974cd02" dependencies = [ "document-features", "js-sys", diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml index 878828cb262..d7afccb09c7 100644 --- a/crates/egui_demo_app/Cargo.toml +++ b/crates/egui_demo_app/Cargo.toml @@ -60,7 +60,7 @@ puffin_http = { version = "0.15", optional = true } # feature "http": -ehttp = { version = "0.3.1", optional = true } +ehttp = { version = "0.4", optional = true } image = { version = "0.24", optional = true, default-features = false, features = [ "jpeg", "png", diff --git a/crates/egui_extras/Cargo.toml b/crates/egui_extras/Cargo.toml index ffab1f4b155..55a1c1688cf 100644 --- a/crates/egui_extras/Cargo.toml +++ b/crates/egui_extras/Cargo.toml @@ -95,4 +95,4 @@ syntect = { version = "5", optional = true, default-features = false, features = resvg = { version = "0.37", optional = true, default-features = false } # http feature -ehttp = { version = "0.3.1", optional = true, default-features = false } +ehttp = { version = "0.4", optional = true, default-features = false } From 5dfb70efd29ef5031ac31bc5a762e45ddfeea68d Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 17 Jan 2024 15:22:25 +0100 Subject: [PATCH 2/2] build fix --- crates/egui_demo_app/src/apps/http_app.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/egui_demo_app/src/apps/http_app.rs b/crates/egui_demo_app/src/apps/http_app.rs index afc378aa46c..d0da5c0a395 100644 --- a/crates/egui_demo_app/src/apps/http_app.rs +++ b/crates/egui_demo_app/src/apps/http_app.rs @@ -182,9 +182,9 @@ fn ui_resource(ui: &mut egui::Ui, resource: &Resource) { egui::Grid::new("response_headers") .spacing(egui::vec2(ui.spacing().item_spacing.x * 2.0, 0.0)) .show(ui, |ui| { - for header in &response.headers { - ui.label(header.0); - ui.label(header.1); + for (k, v) in &response.headers { + ui.label(k); + ui.label(v); ui.end_row(); } })