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

Jump to bottom

Bump the cargo-deps group with 43 updates #3612

Closed
wants to merge 8 commits into from
Closed

Bump the cargo-deps group with 43 updates #3612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6f998c3
Bump the cargo-deps group with 43 updates
dependabot[bot] Feb 23, 2024
0112af0
ambiguous_wide_pointer_comparisons on 1.76+
ranile Feb 27, 2024
4d17e64
bless trybuild output
ranile Feb 27, 2024
81c1a98
pulldown-cmark update
ranile Feb 27, 2024
4a66ae5
axum/hyper update
ranile Feb 27, 2024
6cb27f4
fmt
ranile Feb 27, 2024
5b45778
please clippy
ranile Feb 27, 2024
42b6030
please clippy 2
ranile Feb 27, 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
715 changes: 426 additions & 289 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/async_clock/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ license = "MIT OR Apache-2.0"
yew = { path = "../../packages/yew", features = ["csr"] }
chrono = "0.4"
futures = "0.3"
gloo-net = "0.4"
gloo-net = "0.5"
2 changes: 1 addition & 1 deletion examples/boids/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ getrandom = { version = "0.2", features = ["js"] }
rand = "0.8"
serde = { version = "1.0", features = ["derive"] }
yew = { path = "../../packages/yew", features = ["csr"] }
gloo = "0.10"
gloo = "0.11"

[dependencies.web-sys]
version = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/counter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
license = "MIT OR Apache-2.0"

[dependencies]
gloo = "0.10"
gloo = "0.11"
js-sys = "0.3"
yew = { path = "../../packages/yew", features = ["csr"] }
wasm-bindgen = "0.2"
4 changes: 2 additions & 2 deletions examples/dyn_create_destroy_apps/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ license = "MIT OR Apache-2.0"
js-sys = "0.3"
yew = { path = "../../packages/yew", features = ["csr"] }
slab = "0.4.9"
gloo = "0.10"
gloo = "0.11"
wasm-bindgen = "0.2"

[dependencies.web-sys]
version = "0.3.64"
version = "0.3.68"
features = [
"Document",
"Element",
Expand Down
4 changes: 2 additions & 2 deletions examples/file_upload/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ license = "MIT OR Apache-2.0"
[dependencies]
js-sys = "0.3"
yew = { path = "../../packages/yew", features = ["csr"] }
base64 = "0.21.5"
gloo = "0.10"
base64 = "0.21.7"
gloo = "0.11"

[dependencies.web-sys]
version = "0.3"
Expand Down
6 changes: 3 additions & 3 deletions examples/function_memory_game/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ license = "MIT OR Apache-2.0"

[dependencies]
serde = { version = "1.0", features = ["derive"] }
strum = "0.25"
strum_macros = "0.25"
gloo = "0.10"
strum = "0.26"
strum_macros = "0.26"
gloo = "0.11"
nanoid = "0.4"
rand = "0.8"
getrandom = { version = "0.2", features = ["js"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/function_router/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ rand = { version = "0.8", features = ["small_rng"] }
yew = { path = "../../packages/yew" }
yew-router = { path = "../../packages/yew-router" }
serde = { version = "1.0", features = ["derive"] }
gloo = "0.10"
gloo = "0.11"
wasm-logger = "0.2"
instant = { version = "0.1", features = ["wasm-bindgen"] }
once_cell = "1"
Expand Down
6 changes: 3 additions & 3 deletions examples/function_todomvc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ license = "MIT OR Apache-2.0"

[dependencies]
serde = { version = "1.0", features = ["derive"] }
strum = "0.25"
strum_macros = "0.25"
gloo = "0.10"
strum = "0.26"
strum_macros = "0.26"
gloo = "0.11"
yew = { path = "../../packages/yew", features = ["csr"] }

[dependencies.web-sys]
Expand Down
4 changes: 2 additions & 2 deletions examples/futures/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ edition = "2021"
license = "MIT OR Apache-2.0"

[dependencies]
pulldown-cmark = { version = "0.9", default-features = false }
pulldown-cmark = { version = "0.10", default-features = false }
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
yew = { path = "../../packages/yew", features = ["csr"] }
gloo = "0.10"
gloo = "0.11"

[dependencies.web-sys]
version = "0.3"
Expand Down
60 changes: 26 additions & 34 deletions examples/futures/src/markdown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// Source: https://github.com/acmumn/mentoring/blob/master/web-client/src/view/markdown.rs
use std::rc::Rc;

use pulldown_cmark::{Alignment, CodeBlockKind, Event, Options, Parser, Tag};
use pulldown_cmark::{Alignment, CodeBlockKind, Event, Options, Parser, Tag, TagEnd};
use yew::virtual_dom::{VNode, VTag, VText};
use yew::{html, Classes, Html};

Expand Down Expand Up @@ -50,38 +50,11 @@ pub fn render_markdown(src: &str) -> Html {
let l = spine.len();
assert!(l >= 1);
let mut top = spine.pop().unwrap();
if let Tag::CodeBlock(_) = tag {
if let TagEnd::CodeBlock = tag {
let mut pre = VTag::new("pre");
pre.add_child(top.into());
top = pre;
} else if let Tag::Table(aligns) = tag {
if let Some(top_children) = top.children_mut() {
for r in top_children.to_vlist_mut().iter_mut() {
if let VNode::VTag(ref mut vtag) = r {
if let Some(vtag_children) = Rc::make_mut(vtag).children_mut() {
for (i, c) in
vtag_children.to_vlist_mut().iter_mut().enumerate()
{
if let VNode::VTag(ref mut vtag) = c {
match aligns[i] {
Alignment::None => {}
Alignment::Left => {
add_class(Rc::make_mut(vtag), "text-left")
}
Alignment::Center => {
add_class(Rc::make_mut(vtag), "text-center")
}
Alignment::Right => {
add_class(Rc::make_mut(vtag), "text-right")
}
}
}
}
}
}
}
}
} else if let Tag::TableHead = tag {
} else if let TagEnd::TableHead = tag {
if let Some(top_children) = top.children_mut() {
for c in top_children.to_vlist_mut().iter_mut() {
if let VNode::VTag(ref mut vtag) = c {
Expand Down Expand Up @@ -118,7 +91,7 @@ pub fn render_markdown(src: &str) -> Html {
fn make_tag(t: Tag) -> VTag {
match t {
Tag::Paragraph => VTag::new("p"),
Tag::Heading(n, ..) => VTag::new(n.to_string()),
Tag::Heading { level, .. } => VTag::new(level.to_string()),
Tag::BlockQuote => {
let mut el = VTag::new("blockquote");
el.add_attribute("class", "blockquote");
Expand Down Expand Up @@ -151,9 +124,18 @@ fn make_tag(t: Tag) -> VTag {
el
}
Tag::Item => VTag::new("li"),
Tag::Table(_) => {
Tag::Table(ref alignments) => {
let mut el = VTag::new("table");
el.add_attribute("class", "table");
for align in alignments.iter() {
match align {
Alignment::None => {}
Alignment::Left => add_class(&mut el, "text-left"),
Alignment::Center => add_class(&mut el, "text-center"),
Alignment::Right => add_class(&mut el, "text-right"),
}
}

el
}
Tag::TableHead => VTag::new("th"),
Expand All @@ -169,7 +151,11 @@ fn make_tag(t: Tag) -> VTag {
el.add_attribute("class", "font-weight-bold");
el
}
Tag::Link(_link_type, ref href, ref title) => {
Tag::Link {
dest_url: ref href,
ref title,
..
} => {
let mut el = VTag::new("a");
el.add_attribute("href", href.to_string());
let title = title.clone().into_string();
Expand All @@ -178,7 +164,11 @@ fn make_tag(t: Tag) -> VTag {
}
el
}
Tag::Image(_link_type, ref src, ref title) => {
Tag::Image {
dest_url: ref src,
ref title,
..
} => {
let mut el = VTag::new("img");
el.add_attribute("src", src.to_string());
let title = title.clone().into_string();
Expand All @@ -195,5 +185,7 @@ fn make_tag(t: Tag) -> VTag {
el.add_attribute("class", "text-decoration-strikethrough");
el
}
// empty div
Tag::HtmlBlock | Tag::MetadataBlock(_) => VTag::new("div"),
}
}
2 changes: 1 addition & 1 deletion examples/game_of_life/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ log = "0.4"
rand = "0.8"
wasm-logger = "0.2"
yew = { path = "../../packages/yew", features = ["csr"] }
gloo = "0.10"
gloo = "0.11"
2 changes: 1 addition & 1 deletion examples/inner_html/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"

[dependencies]
yew = { path = "../../packages/yew", features = ["csr"] }
gloo = "0.10"
gloo = "0.11"

[dependencies.web-sys]
version = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/keyed_list/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
license = "MIT OR Apache-2.0"

[dependencies]
fake = "2.9.1"
fake = "2.9.2"
getrandom = { version = "0.2", features = ["js"] }
instant = { version = "0.1", features = ["wasm-bindgen"] }
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion examples/mount_point/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
wasm-bindgen = "0.2"
yew = { path = "../../packages/yew", features = ["csr"] }
gloo = "0.10"
gloo = "0.11"

[dependencies.web-sys]
version = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/password_strength/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
yew = { path = "../../packages/yew", features = ["csr"] }
zxcvbn = "2.2.2"
time = "0.3.30"
time = "0.3.34"
js-sys = "0.3.64"
web-sys = { version = "0.3", features = ["Event","EventTarget","InputEvent"] }
wasm-bindgen = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/portals/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"

[dependencies]
yew = { path = "../../packages/yew", features = ["csr"] }
gloo = "0.10"
gloo = "0.11"
wasm-bindgen = "0.2"

[dependencies.web-sys]
Expand Down
2 changes: 1 addition & 1 deletion examples/router/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ yew = { path = "../../packages/yew", features = ["csr"] }
yew-router = { path = "../../packages/yew-router" }
serde = { version = "1.0", features = ["derive"] }
once_cell = "1"
gloo = "0.10"
gloo = "0.11"
8 changes: 4 additions & 4 deletions examples/simple_ssr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ required-features = ["ssr"]

[dependencies]
yew = { path = "../../packages/yew" }
reqwest = { version = "0.11.22", features = ["json"] }
serde = { version = "1.0.190", features = ["derive"] }
uuid = { version = "1.5.0", features = ["serde"] }
reqwest = { version = "0.11.24", features = ["json"] }
serde = { version = "1.0.193", features = ["derive"] }
uuid = { version = "1.7.0", features = ["serde"] }
futures = "0.3"
bytes = "1.5"

Expand All @@ -26,7 +26,7 @@ wasm-logger = "0.2"
log = "0.4"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1.33.0", features = ["full"] }
tokio = { version = "1.36.0", features = ["full"] }
warp = "0.3"
clap = { version = "4", features = ["derive"] }

Expand Down
8 changes: 4 additions & 4 deletions examples/ssr_router/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ wasm-bindgen-futures = "0.4"
wasm-logger = "0.2"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1.33.0", features = ["full"] }
axum = "0.6"
tokio = { version = "1.36.0", features = ["full"] }
axum = "0.7"
tower = { version = "0.4", features = ["make"] }
tower-http = { version = "0.3", features = ["fs"] }
tower-http = { version = "0.5", features = ["fs"] }
env_logger = "0.10"
clap = { version = "4", features = ["derive"] }
hyper = { version = "0.14", features = ["server", "http1"] }
hyper = { version = "1.2", features = ["server", "http1"] }

[target.'cfg(unix)'.dependencies]
jemallocator = "0.5"
Expand Down
Loading
Loading