From 7351e5ed2c3f9d1fc7a0c6bbf5f9fcdc21327019 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 15 Apr 2020 17:07:47 -0700
Subject: [PATCH] Use $rust_stable

(cherry picked from commit d567799d43f8d074debc7022b8b67b05c22e451e)

# Conflicts:
#	docs/build-cli-usage.sh
---
 docs/build-cli-usage.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/build-cli-usage.sh b/docs/build-cli-usage.sh
index 8dd353401b..29205bbc5a 100755
--- a/docs/build-cli-usage.sh
+++ b/docs/build-cli-usage.sh
@@ -3,7 +3,11 @@ set -e
 
 cd "$(dirname "$0")"
 
+<<<<<<< HEAD
 usage=$(cargo -q run -p solana-cli -- -C ~/.foo --help | sed 's|'"$HOME"'|~|g')
+=======
+usage=$(cargo +"$rust_stable" -q run -p solana-cli -- -C ~/.foo --help | sed -e 's|'"$HOME"'|~|g' -e 's/[[:space:]]\+$//')
+>>>>>>> d567799d4... Use $rust_stable
 
 out=${1:-src/cli/usage.md}
 
@@ -29,6 +33,10 @@ in_subcommands=0
 while read -r subcommand rest; do
   [[ $subcommand == "SUBCOMMANDS:" ]] && in_subcommands=1 && continue
   if ((in_subcommands)); then
+<<<<<<< HEAD
       section "$(cargo -q run -p solana-cli -- help "$subcommand" | sed 's|'"$HOME"'|~|g')" "####" >> "$out"
+=======
+      section "$(cargo +"$rust_stable" -q run -p solana-cli -- help "$subcommand" | sed -e 's|'"$HOME"'|~|g' -e 's/[[:space:]]\+$//')" "####" >> "$out"
+>>>>>>> d567799d4... Use $rust_stable
   fi
 done <<<"$usage">>"$out"