Skip to content

Commit 5acfa25

Browse files
authored
Update nightly Rust toolchain for Bazel (#456)
Fixes #374
1 parent 0c225da commit 5acfa25

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

WORKSPACE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rust_register_toolchains(
3131
edition = "2021",
3232
versions = [
3333
"1.73.0",
34-
"nightly/2023-07-15",
34+
"nightly/2023-12-07",
3535
],
3636
)
3737

native-link-service/src/bytestream_server.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,11 @@ struct ActiveStreamGuard<'a> {
7070
}
7171

7272
impl<'a> ActiveStreamGuard<'a> {
73-
/// Consumes the guard and returns the inner state. The stream will be considered
74-
/// "finished", will remove it from the active_uploads.
75-
fn graceful_finish(mut self) -> (DropCloserWriteHalf, StoreUpdateFuture) {
73+
/// Consumes the guard. The stream will be considered "finished", will
74+
/// remove it from the active_uploads.
75+
fn graceful_finish(mut self) {
7676
let stream_state = self.stream_state.take().unwrap();
7777
self.bytestream_server.active_uploads.lock().remove(&stream_state.uuid);
78-
(stream_state.tx, stream_state.store_update_fut)
7978
}
8079
}
8180

native-link-store/tests/filesystem_store_test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ mod filesystem_store_tests {
310310
.into_inner();
311311
let mut read_dir_stream = ReadDirStream::new(temp_dir_handle);
312312

313-
while let Some(temp_dir_entry) = read_dir_stream.next().await {
313+
if let Some(temp_dir_entry) = read_dir_stream.next().await {
314314
let path = temp_dir_entry?.path();
315315
panic!("No files should exist in temp directory, found: {path:?}");
316316
}
@@ -412,7 +412,7 @@ mod filesystem_store_tests {
412412
.err_tip(|| "Failed opening temp directory")?
413413
.into_inner();
414414
let mut read_dir_stream = ReadDirStream::new(temp_dir_handle);
415-
while let Some(temp_dir_entry) = read_dir_stream.next().await {
415+
if let Some(temp_dir_entry) = read_dir_stream.next().await {
416416
let path = temp_dir_entry?.path();
417417
panic!("No files should exist in temp directory, found: {path:?}");
418418
}
@@ -509,7 +509,7 @@ mod filesystem_store_tests {
509509
.err_tip(|| "Failed opening temp directory")?
510510
.into_inner();
511511
let mut read_dir_stream = ReadDirStream::new(temp_dir_handle);
512-
while let Some(temp_dir_entry) = read_dir_stream.next().await {
512+
if let Some(temp_dir_entry) = read_dir_stream.next().await {
513513
let path = temp_dir_entry?.path();
514514
panic!("No files should exist in temp directory, found: {:?}", path);
515515
}

native-link-util/src/action_messages.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ impl ActionInfo {
191191
.unwrap_or_default()
192192
.try_into()
193193
.map_err(|_| make_input_err!("Failed convert proto duration to system duration"))?,
194-
platform_properties: action.platform.unwrap_or_default().try_into()?,
194+
platform_properties: action.platform.unwrap_or_default().into(),
195195
priority: execute_request.execution_policy.unwrap_or_default().priority,
196196
load_timestamp,
197197
insert_timestamp: queued_timestamp,

0 commit comments

Comments
 (0)