|
28 | 28 | //! I/O panic: |
29 | 29 | //! |
30 | 30 | //! ```rust |
31 | | -//! use fail::{fail_point, FailScenario}; |
| 31 | +//! use fail::fail_point; |
32 | 32 | //! |
33 | 33 | //! fn do_fallible_work() { |
34 | 34 | //! fail_point!("read-dir"); |
35 | 35 | //! let _dir: Vec<_> = std::fs::read_dir(".").unwrap().collect(); |
36 | 36 | //! // ... do some work on the directory ... |
37 | 37 | //! } |
38 | 38 | //! |
39 | | -//! let scenario = FailScenario::setup(); |
| 39 | +//! fail::setup(); |
40 | 40 | //! do_fallible_work(); |
41 | | -//! scenario.teardown(); |
| 41 | +//! fail::teardown(); |
42 | 42 | //! println!("done"); |
43 | 43 | //! ``` |
44 | 44 | //! |
|
82 | 82 | //! Here's a basic pattern for writing unit tests tests with fail points: |
83 | 83 | //! |
84 | 84 | //! ```rust |
85 | | -//! use fail::{fail_point, FailScenario}; |
| 85 | +//! use fail::fail_point; |
86 | 86 | //! |
87 | 87 | //! fn do_fallible_work() { |
88 | 88 | //! fail_point!("read-dir"); |
|
93 | 93 | //! #[test] |
94 | 94 | //! #[should_panic] |
95 | 95 | //! fn test_fallible_work() { |
96 | | -//! let scenario = FailScenario::setup(); |
| 96 | +//! fail::setup(); |
97 | 97 | //! fail::cfg("read-dir", "panic").unwrap(); |
98 | 98 | //! |
99 | 99 | //! do_fallible_work(); |
100 | 100 | //! |
101 | | -//! scenario.teardown(); |
| 101 | +//! fail::teardown(); |
102 | 102 | //! } |
103 | 103 | //! ``` |
104 | 104 | //! |
|
131 | 131 | //! function we used earlier to return a `Result`: |
132 | 132 | //! |
133 | 133 | //! ```rust |
134 | | -//! use fail::{fail_point, FailScenario}; |
| 134 | +//! use fail::fail_point; |
135 | 135 | //! use std::io; |
136 | 136 | //! |
137 | 137 | //! fn do_fallible_work() -> io::Result<()> { |
|
142 | 142 | //! } |
143 | 143 | //! |
144 | 144 | //! fn main() -> io::Result<()> { |
145 | | -//! let scenario = FailScenario::setup(); |
| 145 | +//! fail::setup(); |
146 | 146 | //! do_fallible_work()?; |
147 | | -//! scenario.teardown(); |
| 147 | +//! fail::teardown(); |
148 | 148 | //! println!("done"); |
149 | 149 | //! Ok(()) |
150 | 150 | //! } |
@@ -653,13 +653,12 @@ pub fn eval<R, F: FnOnce(Option<String>) -> R>(name: &str, f: F) -> Option<R> { |
653 | 653 | let id = thread::current().id(); |
654 | 654 | let group = REGISTRY_GROUP.read().unwrap(); |
655 | 655 |
|
656 | | - let registry = group |
657 | | - .get(&id) |
658 | | - .unwrap_or(®ISTRY_GLOBAL.registry) |
659 | | - .read() |
660 | | - .unwrap(); |
661 | | - |
662 | 656 | let p = { |
| 657 | + let registry = group |
| 658 | + .get(&id) |
| 659 | + .unwrap_or(®ISTRY_GLOBAL.registry) |
| 660 | + .read() |
| 661 | + .unwrap(); |
663 | 662 | match registry.get(name) { |
664 | 663 | None => return None, |
665 | 664 | Some(p) => p.clone(), |
|
0 commit comments