diff --git a/Cargo.lock b/Cargo.lock index 50ec99d8a764..4703ebfeecc6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1228,7 +1228,7 @@ dependencies = [ "once_cell", "opener", "pathdiff", - "pulldown-cmark", + "pulldown-cmark 0.9.6", "regex", "serde", "serde_json", @@ -1265,7 +1265,7 @@ dependencies = [ "log", "mdbook", "pretty_env_logger", - "pulldown-cmark", + "pulldown-cmark 0.10.0", ] [[package]] @@ -1773,9 +1773,20 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.5" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags 2.4.1", + "memchr", + "unicase", +] + +[[package]] +name = "pulldown-cmark" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80eb9f69aec5cd8828765a75f739383fbbe3e8b9d84370bde1cc90487700794a" +checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7" dependencies = [ "bitflags 2.4.1", "memchr", @@ -2385,9 +2396,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", diff --git a/mdbook-exerciser/Cargo.toml b/mdbook-exerciser/Cargo.toml index 06c92d767fb7..525ce2f495bc 100644 --- a/mdbook-exerciser/Cargo.toml +++ b/mdbook-exerciser/Cargo.toml @@ -12,4 +12,4 @@ anyhow = "1.0.79" log = "0.4.17" mdbook = "0.4.25" pretty_env_logger = "0.5.0" -pulldown-cmark = { version = "0.9.5", default-features = false } +pulldown-cmark = { version = "0.10.0", default-features = false } diff --git a/mdbook-exerciser/src/lib.rs b/mdbook-exerciser/src/lib.rs index 2d25c6919835..8f6040d675d0 100644 --- a/mdbook-exerciser/src/lib.rs +++ b/mdbook-exerciser/src/lib.rs @@ -13,7 +13,7 @@ // limitations under the License. use log::{info, trace}; -use pulldown_cmark::{Event, Parser, Tag}; +use pulldown_cmark::{Event, Parser, Tag, TagEnd}; use std::fs::{create_dir_all, File}; use std::io::Write; use std::path::Path; @@ -61,8 +61,8 @@ pub fn process(output_directory: &Path, input_contents: &str) -> anyhow::Result< output_file.write(text.as_bytes())?; } } - Event::End(Tag::CodeBlock(x)) => { - info!("End {:?}", x); + Event::End(TagEnd::CodeBlock) => { + info!("End"); current_file = None; } _ => {} diff --git a/src/exercises/concurrency/chat-async/Cargo.toml b/src/exercises/concurrency/chat-async/Cargo.toml index b7193b609462..ac3bbcaaca18 100644 --- a/src/exercises/concurrency/chat-async/Cargo.toml +++ b/src/exercises/concurrency/chat-async/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] futures-util = { version = "0.3.30", features = ["sink"] } http = "1.0.0" -tokio = { version = "1.28.1", features = ["full"] } +tokio = { version = "1.36.0", features = ["full"] } tokio-websockets = { version = "0.5.1", features = ["client", "fastrand", "server", "sha1_smol"] } diff --git a/third_party/cxx/blobstore/src/main.rs b/third_party/cxx/blobstore/src/main.rs index 6ccd0068d649..4aadd77b448b 100644 --- a/third_party/cxx/blobstore/src/main.rs +++ b/third_party/cxx/blobstore/src/main.rs @@ -36,9 +36,9 @@ mod ffi { /// An iterator over contiguous chunks of a discontiguous file object. /// -/// Toy implementation uses a Vec> but in reality this might be iterating -/// over some more complex Rust data structure like a rope, or maybe loading -/// chunks lazily from somewhere. +/// Toy implementation uses a Vec> but in reality this might be +/// iterating over some more complex Rust data structure like a rope, or maybe +/// loading chunks lazily from somewhere. pub struct MultiBuf { chunks: Vec>, pos: usize, diff --git a/third_party/rust-on-exercism/health-statistics.rs b/third_party/rust-on-exercism/health-statistics.rs index e94c097229bd..52ab7ebb72e9 100644 --- a/third_party/rust-on-exercism/health-statistics.rs +++ b/third_party/rust-on-exercism/health-statistics.rs @@ -24,13 +24,7 @@ pub struct HealthReport<'a> { impl User { pub fn new(name: String, age: u32, height: f32) -> Self { - Self { - name, - age, - height, - visit_count: 0, - last_blood_pressure: None, - } + Self { name, age, height, visit_count: 0, last_blood_pressure: None } } // ANCHOR_END: setup @@ -68,18 +62,14 @@ fn main() { fn test_visit() { let mut bob = User::new(String::from("Bob"), 32, 155.2); assert_eq!(bob.visit_count, 0); - let report = bob.visit_doctor(Measurements { - height: 156.1, - blood_pressure: (120, 80), - }); + let report = + bob.visit_doctor(Measurements { height: 156.1, blood_pressure: (120, 80) }); assert_eq!(report.patient_name, "Bob"); assert_eq!(report.visit_count, 1); assert_eq!(report.blood_pressure_change, None); - let report = bob.visit_doctor(Measurements { - height: 156.1, - blood_pressure: (115, 76), - }); + let report = + bob.visit_doctor(Measurements { height: 156.1, blood_pressure: (115, 76) }); assert_eq!(report.visit_count, 2); assert_eq!(report.blood_pressure_change, Some((-5, -4)));