Add [[nodiscard]] where ignoring a Result return type is an error

MarcoFalke · MarcoFalke · commit dddde27f6fbc · 2023-05-29T13:12:45.000+02:00
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
@@ -210,7 +210,8 @@ util::Result<std::unique_ptr<AddrMan>> LoadAddrman(const NetGroupManager& netgro
         return util::Error{strprintf(_("Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start."),
                                      e.what(), PACKAGE_BUGREPORT, fs::quoted(fs::PathToString(path_addr)))};
     }
-    return std::move(addrman); // std::move should be unneccessary but is temporarily needed to work around clang bug (https://github.com/bitcoin/bitcoin/pull/25977#issuecomment-1561270092)
+    return {std::move(addrman)}; // std::move should be unneccessary but is temporarily needed to work around clang bug
+                                 // (https://github.com/bitcoin/bitcoin/pull/25977#issuecomment-1561270092)
 }
 
 void DumpAnchors(const fs::path& anchors_db_path, const std::vector<CAddress>& anchors)
diff --git a/src/kernel/checks.h b/src/kernel/checks.h
@@ -16,8 +16,7 @@ struct Context;
 /**
  *  Ensure a usable environment with all necessary library support.
  */
-util::Result<void> SanityChecks(const Context&);
-
-}
+[[nodiscard]] util::Result<void> SanityChecks(const Context&);
+} // namespace kernel
 
 #endif // BITCOIN_KERNEL_CHECKS_H
diff --git a/src/node/blockmanager_args.h b/src/node/blockmanager_args.h
@@ -12,7 +12,7 @@
 class ArgsManager;
 
 namespace node {
-util::Result<void> ApplyArgsManOptions(const ArgsManager& args, BlockManager::Options& opts);
+[[nodiscard]] util::Result<void> ApplyArgsManOptions(const ArgsManager& args, BlockManager::Options& opts);
 } // namespace node
 
 #endif // BITCOIN_NODE_BLOCKMANAGER_ARGS_H
diff --git a/src/node/chainstatemanager_args.h b/src/node/chainstatemanager_args.h
@@ -11,7 +11,7 @@
 class ArgsManager;
 
 namespace node {
-util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManager::Options& opts);
+[[nodiscard]] util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManager::Options& opts);
 } // namespace node
 
 #endif // BITCOIN_NODE_CHAINSTATEMANAGER_ARGS_H
diff --git a/src/txdb.h b/src/txdb.h
@@ -99,6 +99,6 @@ class CBlockTreeDB : public CDBWrapper
         EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 };
 
-util::Result<void> CheckLegacyTxindex(CBlockTreeDB& block_tree_db);
+[[nodiscard]] util::Result<void> CheckLegacyTxindex(CBlockTreeDB& block_tree_db);
 
 #endif // BITCOIN_TXDB_H
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1074,7 +1074,7 @@ struct MigrationResult {
 };
 
 //! Do all steps to migrate a legacy wallet to a descriptor wallet
-util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context);
+[[nodiscard]] util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context);
 } // namespace wallet
 
 #endif // BITCOIN_WALLET_WALLET_H

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,8 @@ util::Result<std::unique_ptr<AddrMan>> LoadAddrman(const NetGroupManager& netgro`
`210`	`210`	`return util::Error{strprintf(_("Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start."),`
`211`	`211`	`e.what(), PACKAGE_BUGREPORT, fs::quoted(fs::PathToString(path_addr)))};`
`212`	`212`	`}`
`213`		`- return std::move(addrman); // std::move should be unneccessary but is temporarily needed to work around clang bug (https://github.com/bitcoin/bitcoin/pull/25977#issuecomment-1561270092)`
	`213`	`+ return {std::move(addrman)}; // std::move should be unneccessary but is temporarily needed to work around clang bug`
	`214`	`+ // (https://github.com/bitcoin/bitcoin/pull/25977#issuecomment-1561270092)`
`214`	`215`	`}`
`215`	`216`
`216`	`217`	`void DumpAnchors(const fs::path& anchors_db_path, const std::vector<CAddress>& anchors)`