Skip to content

Commit 660e98b

Browse files
authored
ref(upload): Remove redundant function parameter (#3280)
### Description The `options` parameter on `upload_files_chunked` and `poll_assemble` is already contained in the `context` parameter for both functions.
1 parent 54eefbd commit 660e98b

1 file changed

Lines changed: 6 additions & 14 deletions

File tree

src/utils/file_upload.rs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -186,24 +186,19 @@ impl<'a> FileUpload<'a> {
186186
}
187187

188188
pub fn upload(&self) -> Result<()> {
189-
upload_files_chunked(self.context, &self.files, self.context.chunk_upload_options)
189+
upload_files_chunked(self.context, &self.files)
190190
}
191191
}
192192

193-
fn poll_assemble(
194-
checksum: Digest,
195-
chunks: &[Digest],
196-
context: &UploadContext,
197-
options: &ChunkServerOptions,
198-
) -> Result<()> {
193+
fn poll_assemble(checksum: Digest, chunks: &[Digest], context: &UploadContext) -> Result<()> {
199194
let progress_style = ProgressStyle::default_spinner().template("{spinner} Processing files...");
200195

201196
let pb = ProgressBar::new_spinner();
202197
pb.enable_steady_tick(100);
203198
pb.set_style(progress_style);
204199

205200
let assemble_start = Instant::now();
206-
let options_max_wait = match options.max_wait {
201+
let options_max_wait = match context.chunk_upload_options.max_wait {
207202
0 => DEFAULT_MAX_WAIT,
208203
secs => Duration::from_secs(secs),
209204
};
@@ -263,11 +258,8 @@ fn poll_assemble(
263258
Ok(())
264259
}
265260

266-
fn upload_files_chunked(
267-
context: &UploadContext,
268-
files: &SourceFiles,
269-
options: &ChunkServerOptions,
270-
) -> Result<()> {
261+
fn upload_files_chunked(context: &UploadContext, files: &SourceFiles) -> Result<()> {
262+
let options = context.chunk_upload_options;
271263
let archive = source_bundle::build(context, files.values(), None)?;
272264

273265
let progress_style =
@@ -313,7 +305,7 @@ fn upload_files_chunked(
313305
style(">").dim()
314306
);
315307
}
316-
poll_assemble(checksum, &checksums, context, options)
308+
poll_assemble(checksum, &checksums, context)
317309
}
318310

319311
fn print_upload_context_details(context: &UploadContext) {

0 commit comments

Comments
 (0)