From ff33033ad3d7fcf32caa352d76fc243bd20db176 Mon Sep 17 00:00:00 2001
From: Adam Leventhal <ahl@oxide.computer>
Date: Mon, 29 Nov 2021 16:58:30 -0800
Subject: [PATCH] update for nightly-2021-11-24 (#204)

---
 CHANGELOG.adoc      | 1 +
 dropshot/src/lib.rs | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index ded0b7197..2b3c6b70a 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -18,6 +18,7 @@ https://github.com/oxidecomputer/dropshot/compare/v0.6.0\...HEAD[Full list of co
 === Breaking Changes
 
 * https://github.com/oxidecomputer/dropshot/pull/197[#197] Endpoints using wildcard path params (i.e. those using the `/foo/{bar:.*}` syntax) previously could be included in OpenAPI output albeit in a form that was invalid. Specifying a wildcard path **without** also specifying `unpublished = true` is now a **compile-time error**.
+* https://github.com/oxidecomputer/dropshot/pull/204[#204] Rust 1.58.0-nightly introduced a new feature `asm_sym` which the `usdt` crate requires on macOS. As of this change 1.58.0-nightly or later is required to build with the `usdt-probes` feature on macOS.
 
 == 0.6.0 (released 2021-11-18)
 
diff --git a/dropshot/src/lib.rs b/dropshot/src/lib.rs
index 8f59d2d3d..15761e0a5 100644
--- a/dropshot/src/lib.rs
+++ b/dropshot/src/lib.rs
@@ -547,6 +547,10 @@
  * DTrace probes.
  */
 #![cfg_attr(feature = "usdt-probes", feature(asm))]
+#![cfg_attr(
+    all(feature = "usdt-probes", target_os = "macos"),
+    feature(asm_sym)
+)]
 
 #[derive(Debug, Clone, serde::Serialize)]
 pub(crate) struct RequestInfo {