aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2019-05-24 17:39:14 -0700
committerDaniel Mueller <deso@posteo.net>2019-05-24 17:39:14 -0700
commit5383aa73b339e6a53ff027ee6012a3428f67466a (patch)
tree013a10355c77fcf785a740bd533e4294dd994fd7
parent4625be03bbebe74f5efa93a37f287e7911fbbbb4 (diff)
downloadnitrocli-5383aa73b339e6a53ff027ee6012a3428f67466a.tar.gz
nitrocli-5383aa73b339e6a53ff027ee6012a3428f67466a.tar.bz2
Allow for unused doc comments on macros
With Rust 1.35 we get compile errors due to doc comments that are added to macro invocations but not actually included in the expanded output. The rustc wrongly assumes that we want to document the resulting code and not just provide details about the invocation itself. This change explicitly allows for those cases. Alternatively we could have "downgraded" the doc comments to normal comments or removed them altogether. There is little difference between those alternatives.
-rw-r--r--nitrocli/src/args.rs2
-rw-r--r--nitrocli/src/pinentry.rs1
2 files changed, 3 insertions, 0 deletions
diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs
index 7f0bfca..7e4f839 100644
--- a/nitrocli/src/args.rs
+++ b/nitrocli/src/args.rs
@@ -101,6 +101,7 @@ impl<'io> Stdio for ExecCtx<'io> {
}
/// The available Nitrokey models.
+#[allow(unused_doc_comments)]
Enum! {DeviceModel, [
Pro => "pro",
Storage => "storage"
@@ -116,6 +117,7 @@ impl From<DeviceModel> for nitrokey::Model {
}
/// A top-level command for nitrocli.
+#[allow(unused_doc_comments)]
Enum! {Command, [
Config => ("config", config),
Lock => ("lock", lock),
diff --git a/nitrocli/src/pinentry.rs b/nitrocli/src/pinentry.rs
index 8370328..8bab65e 100644
--- a/nitrocli/src/pinentry.rs
+++ b/nitrocli/src/pinentry.rs
@@ -30,6 +30,7 @@ type CowStr = borrow::Cow<'static, str>;
///
/// The available PIN types correspond to the PIN types used by the Nitrokey devices: user and
/// admin.
+#[allow(unused_doc_comments)]
Enum! {PinType, [
Admin => "admin",
User => "user"