Skip to content

Commit 0b7dcb4

Browse files
authored
Merge pull request #584 from swimos/rust-1.73
Upgrades to rust 1.73
2 parents 4b7f89a + cbeb25b commit 0b7dcb4

File tree

82 files changed

+6096
-709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+6096
-709
lines changed

api/swim_api/src/downlink/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ pub enum DownlinkKind {
3232
Event,
3333
/// Accepts key-value pairs and maintains a state as a map.
3434
Map,
35+
/// Accepts map updates but does not maintain any state.
36+
MapEvent,
3537
}
3638

3739
#[derive(Debug, Clone, Copy, PartialEq, Eq)]

api/swim_api/src/protocol/map/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,9 @@ impl<K: StructuralWritable, V: StructuralWritable> Encoder<MapOperation<K, V>>
456456
}
457457
}
458458

459-
/// Repreesentation of map lane messages (used to form the body of Recon messages when operating)
459+
/// Representation of map lane messages (used to form the body of Recon messages when operating)
460460
/// on downlinks. This extends [`MapOperation`] with `Take` (retain the first `n` items) and `Drop`
461-
/// (remove teh first `n` items). We never use these internally but must support them for communicating
461+
/// (remove the first `n` items). We never use these internally but must support them for communicating
462462
/// with other implementations.
463463
#[derive(Copy, Clone, Debug, PartialEq, Eq, Form, Hash)]
464464
#[form_root(::swim_form)]

api/swim_model/src/attr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl From<Attr> for Value {
138138

139139
impl PartialOrd for Attr {
140140
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
141-
Some(self.compare(other))
141+
Some(self.cmp(other))
142142
}
143143
}
144144

api/swim_model/src/http/header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ impl Name {
259259

260260
impl PartialOrd for Name {
261261
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
262-
self.str_value().partial_cmp(other.str_value())
262+
Some(self.cmp(other))
263263
}
264264
}
265265

api/swim_model/src/item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl Item {
7575

7676
impl PartialOrd for Item {
7777
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
78-
Some(self.compare(other))
78+
Some(self.cmp(other))
7979
}
8080
}
8181

api/swim_model/src/text/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ impl PartialEq<&mut str> for Text {
345345

346346
impl PartialOrd for Text {
347347
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
348-
self.as_str().partial_cmp(other.as_str())
348+
Some(self.cmp(other))
349349
}
350350
}
351351

api/swim_model/src/value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ impl Eq for Value {}
685685

686686
impl PartialOrd for Value {
687687
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
688-
Some(self.compare(other))
688+
Some(self.cmp(other))
689689
}
690690
}
691691

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pr: ["main", "byte-routing"]
33

44
variables:
55
RUSTFLAGS: -Dwarnings
6-
RUST_VERSION: 1.72.0
6+
RUST_VERSION: 1.73.0
77

88
stages:
99
- stage: Lint

ci/azure-code-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- template: azure-install-rust.yml
2525
parameters:
26-
rust_version: 1.72.0
26+
rust_version: 1.73.0
2727
- template: azure-install-sccache.yml
2828

2929
- script: cargo install cargo-tarpaulin

client/runtime/src/models.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ impl DownlinkRuntime {
163163
);
164164
runtime.run().await;
165165
}
166-
DownlinkKind::Map => {
166+
DownlinkKind::Map | DownlinkKind::MapEvent => {
167167
let strategy = if config.abort_on_bad_frames {
168168
ReportStrategy::new(AlwaysAbortStrategy).boxed()
169169
} else {

0 commit comments

Comments
 (0)