Merge branch 'google:main' into main

farsi-tools · Sep 3, 2024 · eb134ec · eb134ec
2 parents 338fac1 + c223257
commit eb134ec
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 32 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,7 +6,7 @@ updates:
   - package-ecosystem: cargo
     directory: /
     schedule:
-      interval: weekly
+      interval: monthly
     reviewers:
       - djmitche
       - mgeisler
@@ -23,7 +23,7 @@ updates:
   - package-ecosystem: cargo
     directory: /src/bare-metal/alloc-example/
     schedule:
-      interval: weekly
+      interval: monthly
     reviewers:
       - djmitche
       - mgeisler
@@ -40,7 +40,7 @@ updates:
   - package-ecosystem: cargo
     directory: /src/bare-metal/aps/examples/
     schedule:
-      interval: weekly
+      interval: monthly
     reviewers:
       - djmitche
       - mgeisler
@@ -57,7 +57,7 @@ updates:
   - package-ecosystem: cargo
     directory: /src/bare-metal/microcontrollers/examples/
     schedule:
-      interval: weekly
+      interval: monthly
     reviewers:
       - djmitche
       - mgeisler
@@ -74,7 +74,7 @@ updates:
   - package-ecosystem: cargo
     directory: /src/exercises/bare-metal/compass/
     schedule:
-      interval: weekly
+      interval: monthly
     reviewers:
       - djmitche
       - mgeisler
@@ -91,7 +91,7 @@ updates:
   - package-ecosystem: cargo
     directory: /src/exercises/bare-metal/rtc/
     schedule:
-      interval: weekly
+      interval: monthly
     reviewers:
       - djmitche
       - mgeisler
@@ -108,7 +108,7 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: weekly
+      interval: monthly
     reviewers:
       - djmitche
       - mgeisler

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Check for typos
-        uses: crate-ci/[email protected].1
+        uses: crate-ci/[email protected].3
         with:
           config: ./.github/typos.toml
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mdbook-slide-evaluator/Cargo.toml b/mdbook-slide-evaluator/Cargo.toml
@@ -11,12 +11,12 @@ description = "A tool for evaluating mdbook slides by rendering the html pages a
 anyhow = "1.0.86"
 clap = { version = "4.5.9", features = ["derive"] }
 csv = "1.3.0"
-fantoccini = "0.21.1"
+fantoccini = "0.21.2"
 glob = "0.3.1"
 log = "0.4.22"
 pretty_env_logger = "0.5.0"
 serde = { version = "1.0.209", features = ["derive"] }
 strum = { version = "0.26.3", features = ["derive"] }
-tokio = { version = "1.38.1", features = ["full"] }
+tokio = { version = "1.40.0", features = ["full"] }
 tokio-util = "0.7.11"
 url = "2.5.2"
diff --git a/src/bare-metal/aps/examples/Cargo.lock b/src/bare-metal/aps/examples/Cargo.lock
diff --git a/src/bare-metal/aps/examples/Cargo.toml b/src/bare-metal/aps/examples/Cargo.toml
@@ -13,7 +13,7 @@ smccc = "0.1.1"
 spin = "0.9.8"
 
 [build-dependencies]
-cc = "1.1.14"
+cc = "1.1.15"
 
 [[bin]]
 name = "improved"

diff --git a/src/concurrency/async-exercises/chat-async/Cargo.toml b/src/concurrency/async-exercises/chat-async/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 [dependencies]
 futures-util = { version = "0.3.30", features = ["sink"] }
 http = "1.1.0"
-tokio = { version = "1.39.3", features = ["full"] }
+tokio = { version = "1.40.0", features = ["full"] }
 tokio-websockets = { version = "0.9.0", features = ["client", "fastrand", "server", "sha1_smol"] }
diff --git a/src/concurrency/send-sync/examples.md b/src/concurrency/send-sync/examples.md
@@ -30,10 +30,12 @@ Typically because of interior mutability:
 
 ## `!Send + Sync`
 
-These types are thread-safe, but they cannot be moved to another thread:
+These types are safe to access (via shared references) from multiple threads,
+but they cannot be moved to another thread:
 
 - `MutexGuard<T: Sync>`: Uses OS level primitives which must be deallocated on
-  the thread which created them.
+  the thread which created them. However, an already-locked mutex can have its
+  guarded variable read by any thread with which the guard is shared.
 
 ## `!Send + !Sync`
 

diff --git a/src/exercises/bare-metal/rtc/Cargo.lock b/src/exercises/bare-metal/rtc/Cargo.lock
diff --git a/src/exercises/bare-metal/rtc/Cargo.toml b/src/exercises/bare-metal/rtc/Cargo.toml
@@ -15,4 +15,4 @@ smccc = "0.1.1"
 spin = "0.9.8"
 
 [build-dependencies]
-cc = "1.1.14"
+cc = "1.1.15"
diff --git a/src/glossary.md b/src/glossary.md
@@ -32,6 +32,9 @@ h1#glossary ~ ul > li:first-line {
   Dynamic memory allocation on [the heap](memory-management/review.md).
 - argument:\
   Information that is passed into a function or method.
+- associated type:\
+  A type associated with a specific trait. Useful for defining the relationship
+  between types.
 - Bare-metal Rust:\
   Low-level Rust development, often deployed to a system without an operating
   system. See [Bare-metal Rust](bare-metal.md).

diff --git a/src/std-types/hashmap.md b/src/std-types/hashmap.md
@@ -51,7 +51,7 @@ fn main() {
       .get("Harry Potter and the Sorcerer's Stone")
       .unwrap_or(&336);
   let pc2 = page_counts
-      .entry("The Hunger Games".to_string())
+      .entry("The Hunger Games")
       .or_insert(374);
   ```
 - Unlike `vec!`, there is unfortunately no standard `hashmap!` macro.

diff --git a/src/testing/Cargo.toml b/src/testing/Cargo.toml
@@ -4,6 +4,9 @@ version = "0.1.0"
 edition = "2021"
 publish = false
 
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(never)'] }
+
 [[bin]]
 name = "luhn"
 path = "exercise.rs"