From 9cc1d102253a22d8f6560cd08b96b6c536298dd4 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sat, 8 May 2021 00:13:39 +0300
Subject: toolset "visual-studio" -> "vs"

---
 .github/workflows/msvc_versions.yml | 12 ++++++------
 project/toolset.py                  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/msvc_versions.yml b/.github/workflows/msvc_versions.yml
index 4159dd7..d55ef00 100644
--- a/.github/workflows/msvc_versions.yml
+++ b/.github/workflows/msvc_versions.yml
@@ -16,18 +16,18 @@ jobs:
           - msvc-140
           - msvc-141
           - msvc-142
-          - visual-studio-2015
-          - visual-studio-2017
-          - visual-studio-2019
+          - vs-2015
+          - vs-2017
+          - vs-2019
 
         include:
           # Runner image.
           - {toolset: msvc-140, os: windows-2016}
           - {toolset: msvc-141, os: windows-2016}
           - {toolset: msvc-142, os: windows-2019}
-          - {toolset: visual-studio-2015, os: windows-2016}
-          - {toolset: visual-studio-2017, os: windows-2016}
-          - {toolset: visual-studio-2019, os: windows-2019}
+          - {toolset: vs-2015, os: windows-2016}
+          - {toolset: vs-2017, os: windows-2016}
+          - {toolset: vs-2019, os: windows-2019}
 
           # Boost version.
           - boost-version: 1.72.0
diff --git a/project/toolset.py b/project/toolset.py
index 3bd4d32..a73a8d5 100644
--- a/project/toolset.py
+++ b/project/toolset.py
@@ -139,7 +139,7 @@ class VisualStudioVersion(Enum):
 class ToolsetType(Enum):
     AUTO = 'auto'
     MSVC = 'msvc'
-    VISUAL_STUDIO = 'visual-studio'
+    VISUAL_STUDIO = 'vs'
     GCC = 'gcc'
     MINGW = 'mingw'
     CLANG = 'clang'
@@ -154,7 +154,7 @@ class ToolsetType(Enum):
         if self is ToolsetType.MSVC:
             return 'Use cl.exe.'
         if self is ToolsetType.VISUAL_STUDIO:
-            return "Same as 'msvc'."
+            return "Visual Studio; same as 'msvc'."
         if self is ToolsetType.GCC:
             return 'Use gcc/g++.'
         if self is ToolsetType.MINGW:
-- 
cgit v1.2.3