0
Files
src/ui/PRESUBMIT.py
ricea e3646b0b4f Re-enable PRESUBMIT check for empty unique_ptr<> rvalue
ui/PRESUBMIT.py contained a check for constructing an empty unique_ptr<>
as an rvalue. It's almost always better to use nullptr instead. However, this
check was disabled because it was overly broad, matching things like

  std::vector<std::unique_ptr<T>>()

which cannot be replaced by nullptr.

Make the check stricter so that it will not overmatch, and re-enable it.

Also fix some violations of the rule that were found during testing.

BUG=

Review-Url: https://codereview.chromium.org/2311783002
Cr-Commit-Position: refs/heads/master@{#416865}
2016-09-07 06:34:08 +00:00

57 lines
2.0 KiB
Python

# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Presubmit script for ui.
See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
for more details about the presubmit API built into depot_tools.
"""
INCLUDE_CPP_FILES_ONLY = (
r'.*\.(cc|h|mm)$',
)
def CheckUniquePtr(input_api, output_api,
white_list=INCLUDE_CPP_FILES_ONLY, black_list=None):
black_list = tuple(black_list or input_api.DEFAULT_BLACK_LIST)
source_file_filter = lambda x: input_api.FilterSourceFile(x,
white_list,
black_list)
errors = []
for f in input_api.AffectedSourceFiles(source_file_filter):
for line_number, line in f.ChangedContents():
# Disallow:
# return std::unique_ptr<T>(foo);
# bar = std::unique_ptr<T>(foo);
# But allow:
# return std::unique_ptr<T[]>(foo);
# bar = std::unique_ptr<T[]>(foo);
if input_api.re.search(
r'(=|\breturn)\s*std::unique_ptr<[^\[\]>]+>\([^)]+\)', line):
errors.append(output_api.PresubmitError(
('%s:%d uses explicit std::unique_ptr constructor. ' +
'Use base::MakeUnique<T>() or base::WrapUnique() instead.') %
(f.LocalPath(), line_number)))
# Disallow:
# std::unique_ptr<T>()
if input_api.re.search(r'\bstd::unique_ptr<[^<>]+>\(\)', line):
errors.append(output_api.PresubmitError(
'%s:%d uses std::unique_ptr<T>(). Use nullptr instead.' %
(f.LocalPath(), line_number)))
return errors
def CheckChange(input_api, output_api):
results = []
results += CheckUniquePtr(input_api, output_api)
return results
def CheckChangeOnUpload(input_api, output_api):
return CheckChange(input_api, output_api)
def CheckChangeOnCommit(input_api, output_api):
return CheckChange(input_api, output_api)