@@ -119,14 +119,12 @@ impl NotifyActor {
119
119
self . watched_dir_entries . clear ( ) ;
120
120
self . watched_file_entries . clear ( ) ;
121
121
122
- self . sender
123
- . send ( loader:: Message :: Progress {
124
- n_total,
125
- n_done : LoadingProgress :: Started ,
126
- config_version,
127
- dir : None ,
128
- } )
129
- . unwrap ( ) ;
122
+ self . send ( loader:: Message :: Progress {
123
+ n_total,
124
+ n_done : LoadingProgress :: Started ,
125
+ config_version,
126
+ dir : None ,
127
+ } ) ;
130
128
131
129
let ( entry_tx, entry_rx) = unbounded ( ) ;
132
130
let ( watch_tx, watch_rx) = unbounded ( ) ;
@@ -142,31 +140,25 @@ impl NotifyActor {
142
140
entry,
143
141
do_watch,
144
142
|file| {
145
- self . sender
146
- . send ( loader:: Message :: Progress {
147
- n_total,
148
- n_done : LoadingProgress :: Progress (
149
- processed
150
- . load ( std:: sync:: atomic:: Ordering :: Relaxed ) ,
151
- ) ,
152
- dir : Some ( file) ,
153
- config_version,
154
- } )
155
- . unwrap ( )
143
+ self . send ( loader:: Message :: Progress {
144
+ n_total,
145
+ n_done : LoadingProgress :: Progress (
146
+ processed. load ( std:: sync:: atomic:: Ordering :: Relaxed ) ,
147
+ ) ,
148
+ dir : Some ( file) ,
149
+ config_version,
150
+ } ) ;
156
151
} ,
157
152
) ;
158
- self . sender . send ( loader:: Message :: Loaded { files } ) . unwrap ( ) ;
159
- self . sender
160
- . send ( loader:: Message :: Progress {
161
- n_total,
162
- n_done : LoadingProgress :: Progress (
163
- processed. fetch_add ( 1 , std:: sync:: atomic:: Ordering :: AcqRel )
164
- + 1 ,
165
- ) ,
166
- config_version,
167
- dir : None ,
168
- } )
169
- . unwrap ( ) ;
153
+ self . send ( loader:: Message :: Loaded { files } ) ;
154
+ self . send ( loader:: Message :: Progress {
155
+ n_total,
156
+ n_done : LoadingProgress :: Progress (
157
+ processed. fetch_add ( 1 , std:: sync:: atomic:: Ordering :: AcqRel ) + 1 ,
158
+ ) ,
159
+ config_version,
160
+ dir : None ,
161
+ } ) ;
170
162
} ) ;
171
163
172
164
drop ( watch_tx) ;
0 commit comments