Remove slide on shadowing (#2596)

google · Feb 6, 2025 · f1459c5 · f1459c5
1 parent 72c7618
commit f1459c5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 38 deletions.
diff --git a/src/SUMMARY.md b/src/SUMMARY.md
@@ -30,7 +30,6 @@
     - [Solution](types-and-values/solution.md)
 - [Control Flow Basics](control-flow-basics.md)
   - [Blocks and Scopes](control-flow-basics/blocks-and-scopes.md)
-    - [Scopes and Shadowing](control-flow-basics/blocks-and-scopes/scopes.md)
   - [`if` Expressions](control-flow-basics/if.md)
   - [`match` Expressions](control-flow-basics/match.md)
   - [Loops](control-flow-basics/loops.md)

diff --git a/src/control-flow-basics/blocks-and-scopes.md b/src/control-flow-basics/blocks-and-scopes.md
@@ -4,8 +4,6 @@ minutes: 5
 
 # Blocks and Scopes
 
-## Blocks
-
 A block in Rust contains a sequence of expressions, enclosed by braces `{}`.
 Each block has a value and a type, which are those of the last expression of the
 block:
@@ -19,14 +17,22 @@ fn main() {
         z - y
     };
     println!("x: {x}");
+    // println!("y: {y}");
 }
 ```
 
 If the last expression ends with `;`, then the resulting value and type is `()`.
 
+A variable's scope is limited to the enclosing block.
+
 <details>
 
 - You can show how the value of the block changes by changing the last line in
   the block. For instance, adding/removing a semicolon or using a `return`.
 
+- Demonstrate that attempting to access `y` outside of its scope won't compile.
+
+- Values are effectively "deallocated" when they go out of their scope, even if
+  their data on the stack is still there.
+
 </details>
diff --git a/src/control-flow-basics/blocks-and-scopes/scopes.md b/src/control-flow-basics/blocks-and-scopes/scopes.md