From 1dae60ea4c0630ccb0c0188ad669a670acfb954d Mon Sep 17 00:00:00 2001 From: CrLF0710 Date: Wed, 4 Jul 2018 22:49:35 +0800 Subject: [PATCH 1/2] Include VS 2017 in error message. Update error prompt message to indicate that VS 2017 is supported (for a while now). --- src/librustc_codegen_llvm/back/link.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs index 7e24e1114a0c2..b1aa6ccacb157 100644 --- a/src/librustc_codegen_llvm/back/link.rs +++ b/src/librustc_codegen_llvm/back/link.rs @@ -816,7 +816,7 @@ fn link_natively(sess: &Session, if sess.target.target.options.is_like_msvc && linker_not_found { sess.note_without_error("the msvc targets depend on the msvc linker \ but `link.exe` was not found"); - sess.note_without_error("please ensure that VS 2013 or VS 2015 was installed \ + sess.note_without_error("please ensure that VS 2013, VS 2015 or VS 2017 was installed \ with the Visual C++ option"); } sess.abort_if_errors(); From 30063ae2a5316edf1025c25b85d67f91b3533333 Mon Sep 17 00:00:00 2001 From: CrLF0710 Date: Wed, 4 Jul 2018 23:36:51 +0800 Subject: [PATCH 2/2] Shorten the line Shorten the line to make tidy happy. --- src/librustc_codegen_llvm/back/link.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs index b1aa6ccacb157..70053cb7e9d80 100644 --- a/src/librustc_codegen_llvm/back/link.rs +++ b/src/librustc_codegen_llvm/back/link.rs @@ -816,8 +816,8 @@ fn link_natively(sess: &Session, if sess.target.target.options.is_like_msvc && linker_not_found { sess.note_without_error("the msvc targets depend on the msvc linker \ but `link.exe` was not found"); - sess.note_without_error("please ensure that VS 2013, VS 2015 or VS 2017 was installed \ - with the Visual C++ option"); + sess.note_without_error("please ensure that VS 2013, VS 2015 or VS 2017 \ + was installed with the Visual C++ option"); } sess.abort_if_errors(); }