Merge remote-tracking branch 'remotes/origin/master' into nightly-1.29

1 files changed, 5 insertions, 1 deletions

diff --git a/tools/minicargo/manifest.cpp b/tools/minicargo/manifest.cpp
index 8c0a7f44..edebd71a 100644
--- a/tools/minicargo/manifest.cpp
+++ b/tools/minicargo/manifest.cpp
@@ -317,7 +317,7 @@ PackageManifest PackageManifest::load_from_toml(const ::std::string& path)
             rv.m_targets.push_back(PackageTarget { PackageTarget::Type::Lib });
         }
     }
-    // - If there's no binary section, but src/main.rs exists, add one
+    // - If there's no binary section, but src/main.rs exists, add as a binary
     if( ! ::std::any_of(rv.m_targets.begin(), rv.m_targets.end(), [](const auto& x){ return x.m_type == PackageTarget::Type::Bin; }) )
     {
         // No library, add one pointing to lib.rs
@@ -327,6 +327,10 @@ PackageManifest PackageManifest::load_from_toml(const ::std::string& path)
             rv.m_targets.push_back(PackageTarget { PackageTarget::Type::Bin });
         }
     }
+    if( rv.m_targets.empty() )
+    {
+        throw ::std::runtime_error(format("Manifest file ", path, " didn't specify any targets (and src/{main,lib}.rs doesn't exist)"));
+    }
 
     // Default target names
     for(auto& tgt : rv.m_targets)