Remove IWYU False Positives From Other Namespaces (#273)

geoffviola · web-flow · commit 8d8e5fc20600 · 2024-05-22T19:19:15.000-04:00
This PR removes the false positives from `_HEADERS_CONTAINING_TEMPLATES`
that come from non `std` namespaces. Users of boost or other namespaces
will no longer get false positives.

```c++
// Warn
set&lt;int&gt; blah1;
std::set&lt;int&gt; blah2;
::std::set&lt;int&gt; blah2;
  set&lt;int&gt; blah1;
  std::set&lt;int&gt; blah2;
  ::std::set&lt;int&gt; blah2;

//  NO WARN
foo.set&lt;int&gt;();
foo-&gt;set&lt;int&gt;();

boost::container::set&lt;int&gt; blah3;
blah::std::set&lt;int&gt; blah3;
my_std::set&lt;int&gt; blah3;
my_set&lt;int&gt; blah4;
coolset&lt;int&gt; blah5;
std::blah&lt;int&gt; blah6;
::set&lt;int&gt; blah7;
```
diff --git a/cpplint.py b/cpplint.py
@@ -6019,7 +6019,7 @@ def ExpectingFunctionArgs(clean_lines, linenum):
     ('<memory>', ('allocator', 'make_shared', 'make_unique', 'shared_ptr',
                   'unique_ptr', 'weak_ptr')),
     ('<queue>', ('queue', 'priority_queue',)),
-    ('<set>', ('multiset',)),
+    ('<set>', ('set', 'multiset',)),
     ('<stack>', ('stack',)),
     ('<string>', ('char_traits', 'basic_string',)),
     ('<tuple>', ('tuple',)),
@@ -6072,12 +6072,9 @@ def ExpectingFunctionArgs(clean_lines, linenum):
         (re.compile(r'((\bstd::)|[^>.:])\b' + _template + r'(<.*?>)?\([^\)]'),
             _template,
             _header))
-# Match set<type>, but not foo->set<type>, foo.set<type>
-_re_pattern_headers_maybe_templates.append(
-    (re.compile(r'[^>.]\bset\s*\<'),
-        'set<>',
-        '<set>'))
-# Match 'map<type> var' and 'std::map<type>(...)', but not 'map<type>(...)''
+
+# Map is often overloaded. Only check, if it is fully qualified.
+# Match 'std::map<type>(...)', but not 'map<type>(...)''
 _re_pattern_headers_maybe_templates.append(
     (re.compile(r'(std\b::\bmap\s*\<)|(^(std\b::\b)map\b\(\s*\<)'),
         'map<>',
@@ -6088,7 +6085,7 @@ def ExpectingFunctionArgs(clean_lines, linenum):
 for _header, _templates in _HEADERS_CONTAINING_TEMPLATES:
   for _template in _templates:
     _re_pattern_templates.append(
-        (re.compile(r'(\<|\b)' + _template + r'\s*\<'),
+        (re.compile(r'((^|(^|\s|((^|\W)::))std::)|[^>.:]\b)' + _template + r'\s*\<'),
          _template + '<>',
          _header))
 
diff --git a/cpplint_unittest.py b/cpplint_unittest.py
@@ -1249,6 +1249,12 @@ def testIncludeWhatYouUse(self):
         auto res = map<Bar>();
         """,
         '')
+    # False positive for boost::container::set
+    self.TestIncludeWhatYouUse(
+        """
+        boost::container::set<int> foo;
+        """,
+        '')
 
   def testFilesBelongToSameModule(self):
     f = cpplint.FilesBelongToSameModule
