feat utils: mark more containers with lifetimebound annotations

commit_hash:24adda0d8e82eedfccb00e60d90f8d030c787e8d

Author: Anton3

core/include/userver/dynamic_config/snapshot.hpp

@@ -7,6 +7,7 @@
 #include <string>
 #include <type_traits>
 
+#include <userver/compiler/impl/lifetime.hpp>
 #include <userver/dynamic_config/impl/snapshot.hpp>
 #include <userver/dynamic_config/impl/to_json.hpp>
 #include <userver/formats/json_fwd.hpp>
@@ -137,7 +138,7 @@ class Snapshot final {
 
     /// Used to access individual configs in the type-safe config map
     template <typename VariableType>
-    const VariableType& operator[](const Key<VariableType>& key) const&;
+    const VariableType& operator[](const Key<VariableType>& key) const& USERVER_IMPL_LIFETIME_BOUND;
 
     /// Used to access individual configs in the type-safe config map
     template <typename VariableType>
@@ -146,7 +147,7 @@ class Snapshot final {
     /// @cond
     // No longer supported, use `config[key]` instead
     template <typename T>
-    const T& Get() const&;
+    const T& Get() const& USERVER_IMPL_LIFETIME_BOUND;
 
     // No longer supported, use `config[key]` instead
     template <typename T>
@@ -258,7 +259,7 @@ VariableType Key<VariableType>::Parse(const DocsMap& docs_map) const {
 }
 
 template <typename VariableType>
-const VariableType& Snapshot::operator[](const Key<VariableType>& key) const& {
+const VariableType& Snapshot::operator[](const Key<VariableType>& key) const& USERVER_IMPL_LIFETIME_BOUND {
     return GetData().Get<VariableType>(impl::ConfigIdGetter::Get(key));
 }
 
@@ -268,7 +269,7 @@ const VariableType& Snapshot::operator[](const Key<VariableType>&) && {
 }
 
 template <typename T>
-const T& Snapshot::Get() const& {
+const T& Snapshot::Get() const& USERVER_IMPL_LIFETIME_BOUND {
     return (*this)[T::kDeprecatedKey];
 }
 

core/include/userver/dynamic_config/source.hpp

@@ -7,6 +7,7 @@
 #include <string_view>
 #include <utility>
 
+#include <userver/compiler/impl/lifetime.hpp>
 #include <userver/concurrent/async_event_source.hpp>
 #include <userver/dynamic_config/snapshot.hpp>
 #include <userver/utils/assert.hpp>
@@ -23,10 +24,10 @@ class VariableSnapshotPtr final {
     VariableSnapshotPtr(VariableSnapshotPtr&&) = delete;
     VariableSnapshotPtr& operator=(VariableSnapshotPtr&&) = delete;
 
-    const VariableType& operator*() const& { return *variable_; }
+    const VariableType& operator*() const& USERVER_IMPL_LIFETIME_BOUND { return *variable_; }
     const VariableType& operator*() && { ReportMisuse(); }
 
-    const VariableType* operator->() const& { return variable_; }
+    const VariableType* operator->() const& USERVER_IMPL_LIFETIME_BOUND { return variable_; }
     const VariableType* operator->() && { ReportMisuse(); }
 
 private:

universal/include/userver/utils/not_null.hpp

@@ -8,12 +8,23 @@
 #include <type_traits>
 #include <utility>
 
+#include <userver/compiler/impl/lifetime.hpp>
 #include <userver/utils/assert.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
 namespace utils {
 
+namespace impl {
+
+template <typename T>
+struct IsStdSharedPtr : std::false_type {};
+
+template <typename T>
+struct IsStdSharedPtr<std::shared_ptr<T>> : std::true_type {};
+
+}  // namespace impl
+
 /// @ingroup userver_universal userver_containers
 ///
 /// @brief Restricts a pointer or smart pointer to only hold non-null values.
@@ -91,6 +102,18 @@ class NotNull {
 
     constexpr decltype(auto) operator*() const& { return *GetBase(); }
 
+    constexpr decltype(auto) operator->() const& USERVER_IMPL_LIFETIME_BOUND
+    requires(!std::is_trivially_copyable_v<T>) && (!impl::IsStdSharedPtr<T>::value)
+    {
+        return GetBase();
+    }
+
+    constexpr decltype(auto) operator*() const& USERVER_IMPL_LIFETIME_BOUND
+    requires(!std::is_trivially_copyable_v<T>) && (!impl::IsStdSharedPtr<T>::value)
+    {
+        return *GetBase();
+    }
+
     template <typename U>
     constexpr bool operator==(const NotNull<U>& other) const& {
         return GetBase() == other.GetBase();