src/SUMMARY.md

@@ -11,7 +11,6 @@
   - [BoolStream](./exercises/bool_stream.md)
   - [RcChars](./exercises/rcchars.md)
   - [Async Fn](./exercises/async_fn.md)
-  - [Get Functions](./exercises/get_functions.md)
 - [Chapter 2](./chapter_2.md)
   - [AnyStr](./exercises/anystr.md)
   - [Mode](./exercises/mode.md)

src/exercises/fromref.md

@@ -1,5 +1,3 @@
-# `From<&T>`
-
 Make this compile and pass tests:
 
 ```rust

src/exercises/get_functions.md

@@ -1,44 +0,0 @@
-# Get `Functions`
-
-Edit the body of `get_functions` to make this compile and pass tests:
-
-```rust
-struct Functions {
-    five: fn() -> i32,
-    increment: fn(i32) -> i32,
-}
-
-fn get_functions() -> &'static Functions {
-# /*
-    let five = || 5;
-    let increment = |n| n + 1;
-    let functions = Functions { five, increment };
-    &functions
-# */
-# &Functions { five: || 5, increment: |n| n + 1 }
-}
-
-assert_eq!((get_functions().five)(), 5);
-assert_eq!((get_functions().increment)(4), 5);
-```
-
-Try solving it in the playground:
-
-```rust,editable,compile_fail
-struct Functions {
-    five: fn() -> i32,
-    increment: fn(i32) -> i32,
-}
-
-fn get_functions() -> &'static Functions {
-    let five = || 5;
-    let increment = |n| n + 1;
-    let functions = Functions { five, increment };
-    &functions
-}
-
-fn main() {
-    assert_eq!((get_functions().five)(), 5);
-    assert_eq!((get_functions().increment)(4), 5);
-}
-```

src/topics.md

@@ -16,7 +16,7 @@ p.s. most of the exercises are actually about `trait`s, this categorisation isn'
 [`RcChars`]: ./exercises/rcchars.md
 [extracting lifetimes]: ./exercises/bool_stream.md
 [exclusive traits]: ./exercises/multiple_blanket.md
-[merging traits]: ./exercises/mode.md
+[merging traits]: ./exercises/modes.md
 [`AnyStr`]: ./exercises/anystr.md
 [composition]: ./exercises/composition.md
 [`Duration`]: ./exercises/duration.md