Merge branch 'master' of github.com:paritytech/substrate into scott_d…

…efault_json_import_blocks

client/service/src/chain_ops.rs

@@ -204,9 +204,6 @@ impl<
 			}
 		}
 
-		let client = self.client;
-		let mut queue = self.import_queue;
-
 		let mut link = WaitLink::new();
 		let mut block_stream: BlockStream<_, Self::Block> = BlockStream::new(input, binary)?;
 
@@ -218,6 +215,9 @@ impl<
 		// This makes it possible either to interleave other operations in-between the block imports,
 		// or to stop the operation completely.
 		let import = future::poll_fn(move |cx| {
+			let client = &self.client;
+			let queue = &mut self.import_queue;
+
 			// Read blocks from the input.
 			match Pin::new(&mut block_stream).poll_next(cx) {
 				Poll::Ready(None) => {