Skip to content

Commit

Permalink
Merge branch 'google:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
DannyRavi authored Aug 19, 2024
2 parents ed2b2be + 56ae649 commit 1dcbb54
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 28 deletions.
36 changes: 18 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions mdbook-course/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ description = "An mdbook preprocessor for comprehensive-rust."

[dependencies]
anyhow = "1.0.86"
clap = "4.5.15"
clap = "4.5.16"
lazy_static = "1.5"
log = "0.4.22"
matter = "0.1.0-alpha4"
mdbook = "0.4.40"
pretty_env_logger = "0.5.0"
regex = "1.10"
serde = "1.0.206"
serde_json = "1.0.124"
serde = "1.0.208"
serde_json = "1.0.125"
serde_yaml = "0.9"
13 changes: 11 additions & 2 deletions src/bare-metal/aps/examples/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/bare-metal/aps/examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ smccc = "0.1.1"
spin = "0.9.8"

[build-dependencies]
cc = "1.1.10"
cc = "1.1.13"

[[bin]]
name = "improved"
Expand Down
2 changes: 1 addition & 1 deletion src/concurrency/async-exercises/chat-async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
[dependencies]
futures-util = { version = "0.3.30", features = ["sink"] }
http = "1.1.0"
tokio = { version = "1.39.2", features = ["full"] }
tokio = { version = "1.39.3", features = ["full"] }
tokio-websockets = { version = "0.9.0", features = ["client", "fastrand", "server", "sha1_smol"] }
13 changes: 11 additions & 2 deletions src/exercises/bare-metal/rtc/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/exercises/bare-metal/rtc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ smccc = "0.1.1"
spin = "0.9.8"

[build-dependencies]
cc = "1.1.10"
cc = "1.1.13"

0 comments on commit 1dcbb54

Please sign in to comment.