[libcxx-commits] [libcxx] b82683b - [libc++] [test] Remove "// -- C++ --" comments from generated .cpp files.

Fri Oct 1 09:05:12 PDT 2021

Author: Arthur O'Dwyer
Date: 2021-10-01T12:04:19-04:00
New Revision: b82683b2eb3601f6e8970861b94ad7b37393aa90

URL: https://github.com/llvm/llvm-project/commit/b82683b2eb3601f6e8970861b94ad7b37393aa90
DIFF: https://github.com/llvm/llvm-project/commit/b82683b2eb3601f6e8970861b94ad7b37393aa90.diff

LOG: [libc++] [test] Remove "// -*- C++ -*-" comments from generated .cpp files.

Even if these comments have a benefit in .h files (for editors that
care about language but can't be configured to treat .h as C++ code),
they certainly have no benefit for files with the .cpp extension.

Discussed in D110794.

Added: 
    

Modified: 
    libcxx/include/version
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_difference.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_difference.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/availability.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/bits.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/different_from.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/errc.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/function_like.h.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/function.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/locale.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_safety.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/node_handle.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/std_stream.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/string.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/tuple.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/decay_copy.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/move.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.module.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.module.verify.cpp
    libcxx/utils/generate_feature_test_macro_components.py
    libcxx/utils/generate_private_header_tests.py

Removed: 
    


################################################################################
diff  --git a/libcxx/include/version b/libcxx/include/version
index 8aa5fd4e7f0f8..09efcfc0e6454 100644

--- a/libcxx/include/version
+++ b/libcxx/include/version
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//===--------------------------- version ----------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.module.verify.cpp
index e445eca753817..26a9e766279b9 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.module.verify.cpp
index 94cbcd38d2399..5f6b144dc2469 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.module.verify.cpp
index 6a7f3066657a0..dbbebe6ade667 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.module.verify.cpp
index c5dc84ca6cad3..ce749df49c873 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.module.verify.cpp
index 85b7ba3e5c06b..646c169e5f0d1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.module.verify.cpp
index 16127b5d37e2f..457dc03dc9de3 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.module.verify.cpp
index 3bcfe37a9df4f..400d354c3c597 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.module.verify.cpp
index 9dc3406388f0b..c213de50fbad9 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.module.verify.cpp
index 22cd8cd653e57..90861e7fbc9c2 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.module.verify.cpp
index 91fff8139151d..a8c0e5303d0e7 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.module.verify.cpp
index 88100beac424d..94dce2dc5160e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.module.verify.cpp
index 40583e7870bcb..0ffe17db37e26 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.module.verify.cpp
index 4465c91ec41f1..b30b98e5404e7 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.module.verify.cpp
index 877b70a7ec25b..0470090e1150d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.module.verify.cpp
index e8217712d8dc3..d061ba75acc76 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.module.verify.cpp
index c5d95121fd740..1a565066f0843 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.module.verify.cpp
index b0075472caba8..42c105c0450d7 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.module.verify.cpp
index 5e464846ffb88..b6f8849595fd0 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.module.verify.cpp
index 0f8788ca0aac3..a793020545d13 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.module.verify.cpp
index 0d92c1fc655e8..786a288e72feb 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.module.verify.cpp
index 123ed3f24e4fd..2e658622adf8b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.module.verify.cpp
index af941eede4ff0..be6678e93b42e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.module.verify.cpp
index d7d37fb341755..d567e5201d9e3 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.module.verify.cpp
index bb777bb97de57..b5211213d84cd 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.module.verify.cpp
index 1d22acb51cefb..58a35f3ab7d8c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.module.verify.cpp
index 67984f067113b..f4196b418525b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.module.verify.cpp
index 1e69336f7cd55..70001c138a3ab 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.module.verify.cpp
index 16e2b911d8a88..babab066f538c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.module.verify.cpp
index 2e8ea0a2fbdd3..5c191c37a32bf 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.module.verify.cpp
index 3bdf3c982e0af..a67bf39053b59 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.module.verify.cpp
index 9545b2d98166f..c5cdfeae119f2 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.module.verify.cpp
index 685e9c5bcb27e..d1640a227956a 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.module.verify.cpp
index 5b3d1ca92ccae..7bdaaaf2a12d0 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.module.verify.cpp
index 6bdf25d3cbbe9..dbf4c10f69954 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.module.verify.cpp
index 6f4f12c6f87d8..60175e4461ae2 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.module.verify.cpp
index 7db68792f9456..a01438d44a3b6 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.module.verify.cpp
index 7c417f6123877..d692be6e45dab 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.module.verify.cpp
index 5d2347b3acadf..37622f64352b0 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.module.verify.cpp
index 2ac533eac94fb..d681675135723 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.module.verify.cpp
index 51f0e90adc1f7..ab7555f8262a5 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.module.verify.cpp
index e25d1927efb0b..99244e92044f1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.module.verify.cpp
index 5f4ca30aa2163..3abafd53872cc 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.module.verify.cpp
index 26f265b0efc69..a094afd2f21a1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.module.verify.cpp
index 1e4174abd6952..0fdef67e5352e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.module.verify.cpp
index a595d38c9a84b..2afe29b96407c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.module.verify.cpp
index 18d7f7d410134..4f416c6ac7c62 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.module.verify.cpp
index b5645a27b3b6d..91ab28b41b543 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.module.verify.cpp
index 80030e2746d69..c5100b1f2e706 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.module.verify.cpp
index ef738d00aeee0..67a359c7bf81e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.module.verify.cpp
index 08df0a706eab9..91b795280f9c2 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.module.verify.cpp
index f421b9d53dd17..1cf437608b3d9 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.module.verify.cpp
index 14e69fa16dcda..77ceaf6ca39cc 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.module.verify.cpp
index 9b189241eb417..4a8b45a82d73d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.module.verify.cpp
index 42242f705a3a3..4db8fdaa6560e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.module.verify.cpp
index f7e213663adf1..134b02eedf76b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.module.verify.cpp
index 92462787e7c0d..21cc2a0f9ae30 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.module.verify.cpp
index e22856ee26008..b2b778d812520 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.module.verify.cpp
index f5fe44f277cf2..726f92ab47778 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.module.verify.cpp
index 5d7c7dd72c035..a23b26cdd6a68 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.module.verify.cpp
index b1a2d743aa52d..ff54c01fa773b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.module.verify.cpp
index cf78bbcaef773..9f79428bfdf69 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.module.verify.cpp
index ff7afca29842f..a4161ef71da74 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.module.verify.cpp
index 55a21c529d411..a6b6e17a10eeb 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.module.verify.cpp
index 4309184ae51ea..a6fdcee78b1ee 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.module.verify.cpp
index ec81e421e68d1..e81a1aa16ca58 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.module.verify.cpp
index cb95f4c97ad72..d8989434b43ec 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.module.verify.cpp
index b67f7fa87fea9..30a0db3f1dbd1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.module.verify.cpp
index 616fe024ae11e..fafc501a66a0f 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.module.verify.cpp
index 6ead238517dd9..68230d6d140ef 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.module.verify.cpp
index 8e174853797fb..197544959ae3a 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.module.verify.cpp
index 2cb958c868f65..ba8f574cd6808 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.module.verify.cpp
index 453c9477691d2..6befaa9baca32 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.module.verify.cpp
index bce9021616a79..958c6a5781b6b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.module.verify.cpp
index 965e26e368eb1..8d2d283be05a9 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.module.verify.cpp
index 1b96ca21ba815..a4313cd2c5900 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_
diff erence.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_
diff erence.module.verify.cpp
index e620e30e54234..0357fa5899b28 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_
diff erence.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_
diff erence.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.module.verify.cpp
index 760995e23e55f..de43e0ff05436 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_
diff erence.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_
diff erence.module.verify.cpp
index 9d9bdad0e3a00..4c2924c1615bb 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_
diff erence.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_
diff erence.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.module.verify.cpp
index b33fa8af0f101..ace992504baac 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.module.verify.cpp
index 14f90a22a106f..790612b5e6c9e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.module.verify.cpp
index 3a07bbda76ac3..6dd3204ad22f7 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.module.verify.cpp
index 3273d90243767..4c45a2fc156b3 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.module.verify.cpp
index d4ed87fcfcc6f..675cb4bb7dc1e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.module.verify.cpp
index 42e369b23efb4..acf53bdcbf12a 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.module.verify.cpp
index fbb405c8f7eaa..b62c34a699f66 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.module.verify.cpp
index 74edd38515349..c84549885396f 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.module.verify.cpp
index 999a0878a7a8f..082a0f3633b3f 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.module.verify.cpp
index 294a06b2cda0b..63b9afdcfd802 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.module.verify.cpp
index b9f59dc17ad96..1fc4b822fe410 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.module.verify.cpp
index c1ee21884b45c..15794807f064e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.module.verify.cpp
index b589e88d35615..6aab92c88bcf1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.module.verify.cpp
index f6a80e2178460..9dbf1b371fa14 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.module.verify.cpp
index 25b065f2e9835..12045bbe43ca6 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/availability.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/availability.module.verify.cpp
index 4f966e736a871..3082b0fc7dfab 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/availability.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/availability.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.module.verify.cpp
index c5fb85d2e05e2..11a90eca4499e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.module.verify.cpp
index 3676f7ad5c50e..160895420b94b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/bits.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/bits.module.verify.cpp
index fa9f78495f918..c3a99dd283f56 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/bits.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/bits.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.module.verify.cpp
index 09586b2d0b574..3324c24d70c60 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.module.verify.cpp
index 00e0927c0ed97..ac53be0bf61ae 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.module.verify.cpp
index 6d704cd47e505..2d1805e4338bc 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.module.verify.cpp
index 21b15b4dfe845..d32f1bf26b6ac 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.module.verify.cpp
index f9e705d331cfd..0e544ee7b3304 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.module.verify.cpp
index 2bc316ef44ca5..4936b175f2bce 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.module.verify.cpp
index b1950f9aa7848..2c0580c2154ac 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.module.verify.cpp
index b2e41dcc30e95..3fc2db9d67290 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.module.verify.cpp
index f7481d6553792..293d1e03cfbaf 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.module.verify.cpp
index 790de84d45045..47efebd9d4286 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.module.verify.cpp
index c3c93c681721c..9b43bd2d03ffd 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.module.verify.cpp
index e49593cda2a76..210c614d3ff92 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.module.verify.cpp
index 131cb6262a831..8f421ab5fa88f 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.module.verify.cpp
index f5f72c5738739..243403be7cdf7 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.module.verify.cpp
index b14f6a8097eed..2683319677a5c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.module.verify.cpp
index 03e6e659319cf..bb81a2a491c83 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.module.verify.cpp
index 81cbb69942c27..7ac3fb62d9b90 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.module.verify.cpp
index 1f1b63f799a26..9aaf8e5d2804a 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.module.verify.cpp
index 71a4be3a47ab5..6ef8f2bbdecb9 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.module.verify.cpp
index 32b187a7405dd..877e5e7965670 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/
diff erent_from.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/
diff erent_from.module.verify.cpp
index 01a0a7b7f1dad..2eb42322beb72 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/
diff erent_from.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/
diff erent_from.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.module.verify.cpp
index a365146683924..9c6e3bd0b4431 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.module.verify.cpp
index b1b844363df23..b34e615834a35 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.module.verify.cpp
index 6527ff6ff2cdc..a8f4efdf0c14c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.module.verify.cpp
index 482e73f8c2977..2c4db9d85b462 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.module.verify.cpp
index 91c5ebfa62882..0a1186a9ecfd8 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.module.verify.cpp
index 6da37861a6cda..ae6b13c6a6e12 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.module.verify.cpp
index 39e8eb243d557..561643b9be77e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.module.verify.cpp
index ed56ed767d171..add480ebf7459 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.module.verify.cpp
index e8da3af8c8fea..dae0de3b089be 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.module.verify.cpp
index 3c046b91a58d3..0e07ad79b03f0 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/errc.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/errc.module.verify.cpp
index 8489223bce611..16dbd962458b3 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/errc.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/errc.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.module.verify.cpp
index 907d41c19acbd..24175de24ab2d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.module.verify.cpp
index 975e45b4fd9db..bbf74ba48e69f 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.module.verify.cpp
index 68aa967058c4d..beb48ea9237c8 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.module.verify.cpp
index f6af9432c8ead..d1efdc16d634c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.module.verify.cpp
index 8037c4d9603b4..f52877da2eaaa 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.module.verify.cpp
index 308f66e8c570f..24c08941b62a4 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.module.verify.cpp
index c331785f36777..a8856c5543f1e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.module.verify.cpp
index 4a5b4b380f6bb..1c0b1cb86d54e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.module.verify.cpp
index e846e765e89bd..5936589d8c0fd 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/function_like.h.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/function_like.h.module.verify.cpp
index f7fd96ebf176f..40622e2e5c98a 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/function_like.h.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/function_like.h.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.module.verify.cpp
index 46be85ab992df..47e3fe1baf28d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.module.verify.cpp
index 4c9210165b664..b444182fab862 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.module.verify.cpp
index b8616081b7ea1..ac8ad2516ea9c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.module.verify.cpp
index 8e2c5e494dfb5..a05c0d0307e78 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.module.verify.cpp
index 4b2f25f93b941..121bc6cd6b768 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.module.verify.cpp
index c639813b97859..302b63b864888 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.module.verify.cpp
index 4f2ba80918727..4f9b1df5507a1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.module.verify.cpp
index 019b19edb8060..e4e665f8f631b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.module.verify.cpp
index 7fe174a3f4a5d..e749a57f2f0cc 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/function.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/function.module.verify.cpp
index 16bd1ddeb09c9..fab65edbd4f5d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/function.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/function.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.module.verify.cpp
index ecb2c0a39fa01..73ed2dc9e702c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.module.verify.cpp
index b795b5ddc6e18..986c3c04ff6cb 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.module.verify.cpp
index a368dc1ce0356..21d2dca9f3752 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.module.verify.cpp
index 3f226199bae5a..602a00a7fd99d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.module.verify.cpp
index 0d8e9c4816860..5935fe230ddf2 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.module.verify.cpp
index f28a1670f7ddd..17d32c30d51b2 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.module.verify.cpp
index d0c50107d5128..809cd79203f15 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.module.verify.cpp
index 5f377080cb74c..15f76c3adc6cc 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.module.verify.cpp
index a08a3cf1943cc..7663d902955bf 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.module.verify.cpp
index f98e81925cc69..3d7f4e8658fed 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.module.verify.cpp
index 7196117d08e37..2b6d36bbc8f1d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.module.verify.cpp
index 17cb624fc70fb..17c81528fee63 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.module.verify.cpp
index 06b3bdd76d5ee..2b9da6b9c7267 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.module.verify.cpp
index aa2b688d277aa..ed23b26f812aa 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.module.verify.cpp
index 0b1a9761f6393..fb7fd889d09c4 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.module.verify.cpp
index 804b2fb2221d3..174000fd4f95b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.module.verify.cpp
index 8cc289342d266..4153892984182 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.module.verify.cpp
index c0caedb4a4025..4b18d93d1b134 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.module.verify.cpp
index 9c2836c03c222..4742547c1e058 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.module.verify.cpp
index a1a49b9c9adbb..2997b5f83beb9 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.module.verify.cpp
index db1f3083876ea..c4b59a321f19d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.module.verify.cpp
index 6e34ff0c3bd1f..4890495a7a991 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.module.verify.cpp
index a8aedc6999089..61cd06f92d6e8 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.module.verify.cpp
index eabd8e712ba26..0bda463ec0452 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.module.verify.cpp
index 1f0f817c0ae19..88cf57a911f39 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.module.verify.cpp
index b9df11c968667..9618675f8e571 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.module.verify.cpp
index 5543561643d57..316c9b71a7294 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.module.verify.cpp
index b1ac8ff129557..10583ba8cb711 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.module.verify.cpp
index b18066442fd4a..bf3bdb3c33689 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.module.verify.cpp
index c42bc62a2a693..c0e0177f86dae 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.module.verify.cpp
index b9a307c50b332..bcf7d5c1adcf2 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.module.verify.cpp
index df7989fd7b32d..5bc167d0a797e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.module.verify.cpp
index 8572c81aa92d1..f54ad3cb7ccce 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.module.verify.cpp
index ef98fd535e0f2..6dde172849d84 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.module.verify.cpp
index 110324b77b4f1..8e55c55c73be5 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.module.verify.cpp
index cb565d969ccda..605e2208f17a9 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.module.verify.cpp
index 9e4c0c42d88b0..43d4f78523a18 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.module.verify.cpp
index a73b44a65b3c6..560ce301fb920 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.module.verify.cpp
index 4098301762b58..6f61e3c0054df 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.module.verify.cpp
index 9f522aa8d828a..a55f5f0bde86c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.module.verify.cpp
index ce9c257f54756..d6e0a276937e7 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.module.verify.cpp
index 01ef28172d419..1c44682025a2f 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.module.verify.cpp
index 69f445fbe6f37..a5021efd41ee6 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.module.verify.cpp
index 0c4c367a45f15..ad97fb322e21d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.module.verify.cpp
index 1dd372bf634ac..ad87e2fdf68f1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.module.verify.cpp
index eb0517abb03c1..98ca79b8af595 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.module.verify.cpp
index 8d7d496a5906d..730583149cc88 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.module.verify.cpp
index d71b9e336bb5a..be10ca6fb9cc2 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.module.verify.cpp
index d151d7264f655..d8c26821a7142 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/locale.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/locale.module.verify.cpp
index b880842c0f44e..98bb452313b78 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/locale.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/locale.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.module.verify.cpp
index d596c76608579..3ea2d3b6c53f1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.module.verify.cpp
index 715ebff8c04ba..ac2ec60deb970 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.module.verify.cpp
index 9d20a0f61fa99..f6e8de6abc84b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.module.verify.cpp
index d7d5e69938945..f530e849e54b4 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.module.verify.cpp
index ab0a5758918f0..ec9483d8935bb 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.module.verify.cpp
index b46f06db44c21..cc143a1430ec7 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.module.verify.cpp
index 0c54b9158ba8d..15fb22b09e74e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.module.verify.cpp
index 957636014204f..28461b3fad95d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_safety.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_safety.module.verify.cpp
index 4edca13465918..9dd3654732355 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_safety.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_safety.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.module.verify.cpp
index 000ef0f3ebbae..501152877792c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.module.verify.cpp
index 6f575bc2e19cc..aa7737697135b 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.module.verify.cpp
index 63edce9b9865b..b69fef8c5397e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.module.verify.cpp
index e9d343b348662..c4680251d5b7c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.module.verify.cpp
index a20d34e780719..48bab53acc853 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.module.verify.cpp
index b9a6bf514cd69..7cd7116cefc47 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.module.verify.cpp
index b7804aa026da6..c7f86b2249975 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.module.verify.cpp
index 0dd39407f7383..13d60b3195966 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/node_handle.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/node_handle.module.verify.cpp
index 01b9fa5e809a1..97dd3fa804477 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/node_handle.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/node_handle.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.module.verify.cpp
index df36fd28cf737..70f5a52d2f8f0 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.module.verify.cpp
index d7ed406863891..b63968a7905ef 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.module.verify.cpp
index b052cec217858..a72d58c8e3706 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.module.verify.cpp
index 49bd520439cdb..2847cc842c603 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.module.verify.cpp
index 9e2a7eead6696..1cf0635f76200 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.module.verify.cpp
index b1749eb3921ed..3059a113b473f 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.module.verify.cpp
index 748706b818204..9492562093bb7 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.module.verify.cpp
index 5f4fa40cac61b..6585847afafaa 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.module.verify.cpp
index 2ffc98b1874a4..27bce19cc69b1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.module.verify.cpp
index 4ae85f5e2b30d..ff10370b520cd 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.module.verify.cpp
index 9edeb03fb2be9..a4e63ab1d948f 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.module.verify.cpp
index c4c8fce38f727..4e068d3c603bb 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.module.verify.cpp
index 4d83c09288224..947b3c898d1f1 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.module.verify.cpp
index 1e0920b7dd12c..9cbbd313f1758 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.module.verify.cpp
index 8b2d4cad2da25..a66c7ca19117e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.module.verify.cpp
index ff48b744d5d93..19bada4336bfc 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.module.verify.cpp
index 4f42d17cfd085..6d7be86d79e62 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.module.verify.cpp
index b1bdc0d1e6874..33de132ed15b4 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.module.verify.cpp
index 5c7169bdd6890..f62283d882781 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.module.verify.cpp
index 66c8f84ee44e8..f0d35242828e2 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.module.verify.cpp
index eb6e276d0a452..a23b911c2d723 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.module.verify.cpp
index 39fab7ea0b312..9d02d7dc7b353 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.module.verify.cpp
index 53bf897a34bdf..ad1ddc44ea6be 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.module.verify.cpp
index 39b1231cc3c9c..f59a0a3c08e81 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.module.verify.cpp
index d014f30e87a6a..f39fc1af64750 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.module.verify.cpp
index 92cea7c2f7e56..55b8d2e0db98e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.module.verify.cpp
index b0136c85c8e49..f658ee540ec2e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/std_stream.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/std_stream.module.verify.cpp
index fe8b52e0962ed..eb360d48a7e1c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/std_stream.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/std_stream.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/string.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/string.module.verify.cpp
index b368079cf93f8..cdd9a21006f36 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/string.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/string.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/tuple.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/tuple.module.verify.cpp
index d20d348b04787..a2808546cdcc0 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/tuple.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/tuple.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.module.verify.cpp
index afa0a116b0886..5a5020c1ee7ba 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.module.verify.cpp
index 0f491b538c223..abf979b5f632d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/decay_copy.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/decay_copy.module.verify.cpp
index e68310754fe27..b15d23c71f2c5 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/decay_copy.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/decay_copy.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.module.verify.cpp
index 8c9feed63a043..065590a28b070 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.module.verify.cpp
index 047b8aeed12b6..5cbe3bdc0c41d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.module.verify.cpp
index ed4af64de985e..27b3f1b745744 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.module.verify.cpp
index ebf2019197e4f..0c811afe91312 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.module.verify.cpp
index 36208e7df162f..eecef46728c0d 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/move.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/move.module.verify.cpp
index e410bdb6da637..46b74153184f9 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/move.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/move.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.module.verify.cpp
index b847833a3e38c..7aa7846b71173 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.module.verify.cpp
index a804894bde901..764a52a50a08e 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.module.verify.cpp
index 94b198ea76b7e..a94572327873a 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.module.verify.cpp
index 0b5208f1a17f4..0e69e9050dbb0 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.module.verify.cpp
index 553c29c582fa4..c3da6cd3abb2c 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.module.verify.cpp
index bb20cbbede3e0..5a94927d566bb 100644
--- a/libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.module.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.module.verify.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff  --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py
index f6527a97c6be9..5fef32b8529a0 100755
--- a/libcxx/utils/generate_feature_test_macro_components.py
+++ b/libcxx/utils/generate_feature_test_macro_components.py
@@ -821,8 +821,8 @@ def indent_to(s, val):
 
 
 def produce_version_header():
-  template="""// -*- C++ -*-
-//===--------------------------- version ----------------------------------===//
+  template="""
+//===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -853,7 +853,7 @@ def produce_version_header():
 // clang-format on
 
 #endif // _LIBCPP_VERSIONH
-"""
+"""[1:]
 
   version_str = template.format(
       synopsis=produce_version_synopsis().strip(),

diff  --git a/libcxx/utils/generate_private_header_tests.py b/libcxx/utils/generate_private_header_tests.py
index 12708c5b8cbf5..18e0aced485aa 100755
--- a/libcxx/utils/generate_private_header_tests.py
+++ b/libcxx/utils/generate_private_header_tests.py
@@ -26,7 +26,7 @@ def get_libcxx_paths():
 
 
 def generate_test(header):
-    return f'''// -*- C++ -*-
+    return f'''
 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -42,7 +42,7 @@ def generate_test(header):
 
 // expected-error@*:* {{{{use of private header from outside its module: '{header}'}}}}
 #include <{header}>
-'''
+'''[1:]
 
 
 def relative_path(path):


        


[libcxx-commits] [libcxx] b82683b - [libc++] [test] Remove "// -*- C++ -*-" comments from generated .cpp files.

[libcxx-commits] [libcxx] b82683b - [libc++] [test] Remove "// -- C++ --" comments from generated .cpp files.