Skip to content

Commit 5f64556

Browse files
jdygert-spokGitHub Enterprise
authored andcommitted

File tree

5 files changed

+6
-31
lines changed

5 files changed

+6
-31
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ authors = ["SpiderOak, Inc."]
1515
edition = "2021"
1616
license = "UNLICENSED"
1717
publish = false
18-
rust-version = "1.76"
18+
rust-version = "1.77"
1919

2020
[workspace.lints.rust]
2121
# missing_docs = "warn"

crates/aps-util/src/ffi.rs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -285,27 +285,3 @@ impl TryFrom<Value> for Label {
285285
))
286286
}
287287
}
288-
289-
/// For `optional int` in policy.
290-
pub(crate) struct OptionalLabel(Option<Label>);
291-
292-
impl OptionalLabel {
293-
const fn none() -> Self {
294-
Self(None)
295-
}
296-
297-
const fn some(label: Label) -> Self {
298-
Self(Some(label))
299-
}
300-
}
301-
302-
impl TryFrom<Value> for OptionalLabel {
303-
type Error = MachineErrorType;
304-
305-
fn try_from(value: Value) -> Result<Self, Self::Error> {
306-
match value {
307-
Value::None => Ok(OptionalLabel::none()),
308-
v => Ok(OptionalLabel::some(v.try_into()?)),
309-
}
310-
}
311-
}

crates/crypto/examples/hsm/hsm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use serde::{Deserialize, Serialize};
1919

2020
/// An error returned by [`Hsm`].
2121
#[derive(Debug)]
22-
pub(crate) enum HsmError {
22+
pub enum HsmError {
2323
/// Unable to authenticate the wrapped key.
2424
Authentication,
2525
/// The key was not found.

crates/rtrack/src/spira/mod.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ fn init() {
164164
}
165165

166166
thread_local! {
167-
static RECORDER: RefCell<Option<Recorder>> = RefCell::new(None);
167+
static RECORDER: RefCell<Option<Recorder>> = const { RefCell::new(None) };
168168
}
169169

170170
/// Records the result of the test.
@@ -253,9 +253,7 @@ enum Needle<'a> {
253253
#[derive(Debug)]
254254
enum Match<'a> {
255255
/// Did not find a match.
256-
///
257-
/// It returns the haystack.
258-
None(&'a str),
256+
None,
259257
/// Found a prefix match ([`Needle::Prefix`]).
260258
Prefix { prefix: &'a str, suffix: &'a str },
261259
/// Found a complete match ([`Needle::Complete`]).
@@ -280,7 +278,7 @@ where
280278
_ => continue,
281279
}
282280
}
283-
Match::None(haystack)
281+
Match::None
284282
}
285283

286284
struct Recorder {

crates/runtime/tests/dsl.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ impl Display for TestRule {
109109
}
110110

111111
#[derive(Debug)]
112+
#[allow(dead_code)] // fields used only via `Debug`
112113
enum TestError {
113114
Storage(StorageError),
114115
Client(ClientError),

0 commit comments

Comments
 (0)