Skip to content

Commit e767ced

Browse files
vadim2404koivunej
andauthored
Update rust to 1.71.0 (#4718)
Co-authored-by: Joonas Koivunen <[email protected]>
1 parent 1309571 commit e767ced

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

libs/pq_proto/src/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,15 @@ impl<'a> BeMessage<'a> {
934934
}
935935
}
936936

937+
fn terminate_code(code: &[u8; 5]) -> [u8; 6] {
938+
let mut terminated = [0; 6];
939+
for (i, &elem) in code.iter().enumerate() {
940+
terminated[i] = elem;
941+
}
942+
943+
terminated
944+
}
945+
937946
#[cfg(test)]
938947
mod tests {
939948
use super::*;
@@ -965,12 +974,3 @@ mod tests {
965974
assert_eq!(split_options(&params), ["foo bar", " \\", "baz ", "lol"]);
966975
}
967976
}
968-
969-
fn terminate_code(code: &[u8; 5]) -> [u8; 6] {
970-
let mut terminated = [0; 6];
971-
for (i, &elem) in code.iter().enumerate() {
972-
terminated[i] = elem;
973-
}
974-
975-
terminated
976-
}

libs/remote_storage/src/local_fs.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,7 @@ impl RemoteStorage for LocalFs {
151151
let mut files = vec![];
152152
let mut directory_queue = vec![full_path.clone()];
153153

154-
while !directory_queue.is_empty() {
155-
let cur_folder = directory_queue
156-
.pop()
157-
.expect("queue cannot be empty: we just checked");
154+
while let Some(cur_folder) = directory_queue.pop() {
158155
let mut entries = fs::read_dir(cur_folder.clone()).await?;
159156
while let Some(entry) = entries.next_entry().await? {
160157
let file_name: PathBuf = entry.file_name().into();

pageserver/src/tenant/layer_map/historic_layer_coverage.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ impl<Value: Clone> HistoricLayerCoverage<Value> {
122122
self.head = self
123123
.historic
124124
.iter()
125-
.rev()
126-
.next()
125+
.next_back()
127126
.map(|(_, v)| v.clone())
128127
.unwrap_or_default();
129128
}

pageserver/src/tenant/layer_map/layer_coverage.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ impl<Value: Clone> LayerCoverage<Value> {
113113
pub fn query(&self, key: i128) -> Option<Value> {
114114
self.nodes
115115
.range(..=key)
116-
.rev()
117-
.next()?
116+
.next_back()?
118117
.1
119118
.as_ref()
120119
.map(|(_, v)| v.clone())

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "1.70.0"
2+
channel = "1.71.0"
33
profile = "default"
44
# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
55
# https://rust-lang.github.io/rustup/concepts/profiles.html

0 commit comments

Comments
 (0)