Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'clang-format-for-linus-v5.19-rc1' of https://github.com/ojeda/linux

Pull clang-format updates from Miguel Ojeda:
"clang-format modernization and cleanups.

A few changes from Brian Norris and Mickaël Salaün to start taking
advantage of some clang-format 11 features, plus a few cleanups and
the usual update of the macro list"

* tag 'clang-format-for-linus-v5.19-rc1' of https://github.com/ojeda/linux:
clang-format: Fix space after for_each macros
clang-format: Fix goto labels indentation
clang-format: Update to clang-format >= 6
clang-format: Extend the for_each list with tools/
clang-format: Simplify command with `sort -u`
clang-format: Use POSIX locale for `sort`
clang-format: Update with v5.18-rc7's `for_each` macro list

+170 -48
+170 -48
.clang-format
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 # 3 - # clang-format configuration file. Intended for clang-format >= 4. 3 + # clang-format configuration file. Intended for clang-format >= 11. 4 4 # 5 5 # For more information, see: 6 6 # ··· 13 13 AlignAfterOpenBracket: Align 14 14 AlignConsecutiveAssignments: false 15 15 AlignConsecutiveDeclarations: false 16 - #AlignEscapedNewlines: Left # Unknown to clang-format-4.0 16 + AlignEscapedNewlines: Left 17 17 AlignOperands: true 18 18 AlignTrailingComments: false 19 19 AllowAllParametersOfDeclarationOnNextLine: false ··· 37 37 AfterObjCDeclaration: false 38 38 AfterStruct: false 39 39 AfterUnion: false 40 - #AfterExternBlock: false # Unknown to clang-format-5.0 40 + AfterExternBlock: false 41 41 BeforeCatch: false 42 42 BeforeElse: false 43 43 IndentBraces: false 44 - #SplitEmptyFunction: true # Unknown to clang-format-4.0 45 - #SplitEmptyRecord: true # Unknown to clang-format-4.0 46 - #SplitEmptyNamespace: true # Unknown to clang-format-4.0 44 + SplitEmptyFunction: true 45 + SplitEmptyRecord: true 46 + SplitEmptyNamespace: true 47 47 BreakBeforeBinaryOperators: None 48 48 BreakBeforeBraces: Custom 49 - #BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0 49 + BreakBeforeInheritanceComma: false 50 50 BreakBeforeTernaryOperators: false 51 51 BreakConstructorInitializersBeforeComma: false 52 - #BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0 52 + BreakConstructorInitializers: BeforeComma 53 53 BreakAfterJavaFieldAnnotations: false 54 54 BreakStringLiterals: false 55 55 ColumnLimit: 80 56 56 CommentPragmas: '^ IWYU pragma:' 57 - #CompactNamespaces: false # Unknown to clang-format-4.0 57 + CompactNamespaces: false 58 58 ConstructorInitializerAllOnOneLineOrOnePerLine: false 59 59 ConstructorInitializerIndentWidth: 8 60 60 ContinuationIndentWidth: 8 ··· 62 62 DerivePointerAlignment: false 63 63 DisableFormat: false 64 64 ExperimentalAutoDetectBinPacking: false 65 - #FixNamespaceComments: false # Unknown to clang-format-4.0 65 + FixNamespaceComments: false 66 66 67 67 # Taken from: 68 - # git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \ 68 + # git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ tools/ \ 69 69 # | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \ 70 - # | sort | uniq 70 + # | LC_ALL=C sort -u 71 71 ForEachMacros: 72 + - '__ata_qc_for_each' 73 + - '__bio_for_each_bvec' 74 + - '__bio_for_each_segment' 75 + - '__evlist__for_each_entry' 76 + - '__evlist__for_each_entry_continue' 77 + - '__evlist__for_each_entry_from' 78 + - '__evlist__for_each_entry_reverse' 79 + - '__evlist__for_each_entry_safe' 80 + - '__for_each_mem_range' 81 + - '__for_each_mem_range_rev' 82 + - '__for_each_thread' 83 + - '__hlist_for_each_rcu' 84 + - '__map__for_each_symbol_by_name' 85 + - '__perf_evlist__for_each_entry' 86 + - '__perf_evlist__for_each_entry_reverse' 87 + - '__perf_evlist__for_each_entry_safe' 88 + - '__rq_for_each_bio' 89 + - '__shost_for_each_device' 72 90 - 'apei_estatus_for_each_section' 73 91 - 'ata_for_each_dev' 74 92 - 'ata_for_each_link' 75 - - '__ata_qc_for_each' 76 93 - 'ata_qc_for_each' 77 94 - 'ata_qc_for_each_raw' 78 95 - 'ata_qc_for_each_with_internal' 79 96 - 'ax25_for_each' 80 97 - 'ax25_uid_for_each' 81 - - '__bio_for_each_bvec' 82 98 - 'bio_for_each_bvec' 83 99 - 'bio_for_each_bvec_all' 100 + - 'bio_for_each_folio_all' 84 101 - 'bio_for_each_integrity_vec' 85 - - '__bio_for_each_segment' 86 102 - 'bio_for_each_segment' 87 103 - 'bio_for_each_segment_all' 88 104 - 'bio_list_for_each' 89 105 - 'bip_for_each_vec' 90 - - 'bitmap_for_each_clear_region' 91 - - 'bitmap_for_each_set_region' 92 - - 'blkg_for_each_descendant_post' 93 - - 'blkg_for_each_descendant_pre' 94 - - 'blk_queue_for_each_rl' 95 106 - 'bond_for_each_slave' 96 107 - 'bond_for_each_slave_rcu' 108 + - 'bpf__perf_for_each_map' 109 + - 'bpf__perf_for_each_map_named' 97 110 - 'bpf_for_each_spilled_reg' 111 + - 'bpf_object__for_each_map' 112 + - 'bpf_object__for_each_program' 113 + - 'bpf_object__for_each_safe' 114 + - 'bpf_perf_object__for_each' 98 115 - 'btree_for_each_safe128' 99 116 - 'btree_for_each_safe32' 100 117 - 'btree_for_each_safe64' ··· 119 102 - 'card_for_each_dev' 120 103 - 'cgroup_taskset_for_each' 121 104 - 'cgroup_taskset_for_each_leader' 105 + - 'cpufreq_for_each_efficient_entry_idx' 122 106 - 'cpufreq_for_each_entry' 123 107 - 'cpufreq_for_each_entry_idx' 124 108 - 'cpufreq_for_each_valid_entry' ··· 127 109 - 'css_for_each_child' 128 110 - 'css_for_each_descendant_post' 129 111 - 'css_for_each_descendant_pre' 112 + - 'damon_for_each_region' 113 + - 'damon_for_each_region_safe' 114 + - 'damon_for_each_scheme' 115 + - 'damon_for_each_scheme_safe' 116 + - 'damon_for_each_target' 117 + - 'damon_for_each_target_safe' 118 + - 'data__for_each_file' 119 + - 'data__for_each_file_new' 120 + - 'data__for_each_file_start' 130 121 - 'device_for_each_child_node' 131 122 - 'displayid_iter_for_each' 123 + - 'dma_fence_array_for_each' 132 124 - 'dma_fence_chain_for_each' 125 + - 'dma_fence_unwrap_for_each' 126 + - 'dma_resv_for_each_fence' 127 + - 'dma_resv_for_each_fence_unlocked' 133 128 - 'do_for_each_ftrace_op' 134 129 - 'drm_atomic_crtc_for_each_plane' 135 130 - 'drm_atomic_crtc_state_for_each_plane' ··· 166 135 - 'drm_mm_for_each_node' 167 136 - 'drm_mm_for_each_node_in_range' 168 137 - 'drm_mm_for_each_node_safe' 138 + - 'dsa_switch_for_each_available_port' 139 + - 'dsa_switch_for_each_cpu_port' 140 + - 'dsa_switch_for_each_port' 141 + - 'dsa_switch_for_each_port_continue_reverse' 142 + - 'dsa_switch_for_each_port_safe' 143 + - 'dsa_switch_for_each_user_port' 144 + - 'dsa_tree_for_each_user_port' 145 + - 'dso__for_each_symbol' 146 + - 'dsos__for_each_with_build_id' 147 + - 'elf_hash_for_each_possible' 148 + - 'elf_section__for_each_rel' 149 + - 'elf_section__for_each_rela' 150 + - 'elf_symtab__for_each_symbol' 151 + - 'evlist__for_each_cpu' 152 + - 'evlist__for_each_entry' 153 + - 'evlist__for_each_entry_continue' 154 + - 'evlist__for_each_entry_from' 155 + - 'evlist__for_each_entry_reverse' 156 + - 'evlist__for_each_entry_safe' 169 157 - 'flow_action_for_each' 170 158 - 'for_each_acpi_dev_match' 171 159 - 'for_each_active_dev_scope' ··· 192 142 - 'for_each_active_iommu' 193 143 - 'for_each_aggr_pgid' 194 144 - 'for_each_available_child_of_node' 145 + - 'for_each_bench' 195 146 - 'for_each_bio' 196 147 - 'for_each_board_func_rsrc' 148 + - 'for_each_btf_ext_rec' 149 + - 'for_each_btf_ext_sec' 197 150 - 'for_each_bvec' 198 151 - 'for_each_card_auxs' 199 152 - 'for_each_card_auxs_safe' ··· 212 159 - 'for_each_child_of_node' 213 160 - 'for_each_clear_bit' 214 161 - 'for_each_clear_bit_from' 162 + - 'for_each_clear_bitrange' 163 + - 'for_each_clear_bitrange_from' 164 + - 'for_each_cmd' 215 165 - 'for_each_cmsghdr' 166 + - 'for_each_collection' 167 + - 'for_each_comp_order' 216 168 - 'for_each_compatible_node' 217 169 - 'for_each_component_dais' 218 170 - 'for_each_component_dais_safe' 219 - - 'for_each_comp_order' 220 171 - 'for_each_console' 221 172 - 'for_each_cpu' 222 173 - 'for_each_cpu_and' 223 174 - 'for_each_cpu_not' 224 175 - 'for_each_cpu_wrap' 225 176 - 'for_each_dapm_widgets' 177 + - 'for_each_dedup_cand' 226 178 - 'for_each_dev_addr' 227 179 - 'for_each_dev_scope' 228 180 - 'for_each_dma_cap_mask' ··· 237 179 - 'for_each_dpcm_fe' 238 180 - 'for_each_drhd_unit' 239 181 - 'for_each_dss_dev' 240 - - 'for_each_dtpm_table' 241 182 - 'for_each_efi_memory_desc' 242 183 - 'for_each_efi_memory_desc_in_map' 243 184 - 'for_each_element' 244 185 - 'for_each_element_extid' 245 186 - 'for_each_element_id' 246 187 - 'for_each_endpoint_of_node' 188 + - 'for_each_event' 189 + - 'for_each_event_tps' 247 190 - 'for_each_evictable_lru' 248 191 - 'for_each_fib6_node_rt_rcu' 249 192 - 'for_each_fib6_walker_rt' ··· 253 194 - 'for_each_free_mem_range' 254 195 - 'for_each_free_mem_range_reverse' 255 196 - 'for_each_func_rsrc' 197 + - 'for_each_group_evsel' 198 + - 'for_each_group_member' 256 199 - 'for_each_hstate' 257 200 - 'for_each_if' 201 + - 'for_each_inject_fn' 202 + - 'for_each_insn' 203 + - 'for_each_insn_prefix' 204 + - 'for_each_intid' 258 205 - 'for_each_iommu' 259 206 - 'for_each_ip_tunnel_rcu' 260 207 - 'for_each_irq_nr' 208 + - 'for_each_lang' 261 209 - 'for_each_link_codecs' 262 210 - 'for_each_link_cpus' 263 211 - 'for_each_link_platforms' 264 212 - 'for_each_lru' 265 213 - 'for_each_matching_node' 266 214 - 'for_each_matching_node_and_match' 267 - - 'for_each_member' 268 - - 'for_each_memcg_cache_index' 269 215 - 'for_each_mem_pfn_range' 270 - - '__for_each_mem_range' 271 216 - 'for_each_mem_range' 272 - - '__for_each_mem_range_rev' 273 217 - 'for_each_mem_range_rev' 274 218 - 'for_each_mem_region' 219 + - 'for_each_member' 220 + - 'for_each_memory' 275 221 - 'for_each_migratetype_order' 276 - - 'for_each_msi_entry' 277 - - 'for_each_msi_entry_safe' 222 + - 'for_each_missing_reg' 278 223 - 'for_each_net' 279 224 - 'for_each_net_continue_reverse' 225 + - 'for_each_net_rcu' 280 226 - 'for_each_netdev' 281 227 - 'for_each_netdev_continue' 282 228 - 'for_each_netdev_continue_rcu' ··· 291 227 - 'for_each_netdev_rcu' 292 228 - 'for_each_netdev_reverse' 293 229 - 'for_each_netdev_safe' 294 - - 'for_each_net_rcu' 295 230 - 'for_each_new_connector_in_state' 296 231 - 'for_each_new_crtc_in_state' 297 232 - 'for_each_new_mst_mgr_in_state' 298 233 - 'for_each_new_plane_in_state' 234 + - 'for_each_new_plane_in_state_reverse' 299 235 - 'for_each_new_private_obj_in_state' 236 + - 'for_each_new_reg' 300 237 - 'for_each_node' 301 238 - 'for_each_node_by_name' 302 239 - 'for_each_node_by_type' ··· 313 248 - 'for_each_old_connector_in_state' 314 249 - 'for_each_old_crtc_in_state' 315 250 - 'for_each_old_mst_mgr_in_state' 251 + - 'for_each_old_plane_in_state' 252 + - 'for_each_old_private_obj_in_state' 316 253 - 'for_each_oldnew_connector_in_state' 317 254 - 'for_each_oldnew_crtc_in_state' 318 255 - 'for_each_oldnew_mst_mgr_in_state' 319 256 - 'for_each_oldnew_plane_in_state' 320 257 - 'for_each_oldnew_plane_in_state_reverse' 321 258 - 'for_each_oldnew_private_obj_in_state' 322 - - 'for_each_old_plane_in_state' 323 - - 'for_each_old_private_obj_in_state' 324 259 - 'for_each_online_cpu' 325 260 - 'for_each_online_node' 326 261 - 'for_each_online_pgdat' 262 + - 'for_each_path' 327 263 - 'for_each_pci_bridge' 328 264 - 'for_each_pci_dev' 329 - - 'for_each_pci_msi_entry' 330 265 - 'for_each_pcm_streams' 331 266 - 'for_each_physmem_range' 332 267 - 'for_each_populated_zone' ··· 334 269 - 'for_each_present_cpu' 335 270 - 'for_each_prime_number' 336 271 - 'for_each_prime_number_from' 272 + - 'for_each_probe_cache_entry' 337 273 - 'for_each_process' 338 274 - 'for_each_process_thread' 339 275 - 'for_each_prop_codec_conf' ··· 344 278 - 'for_each_prop_dlc_cpus' 345 279 - 'for_each_prop_dlc_platforms' 346 280 - 'for_each_property_of_node' 281 + - 'for_each_reg' 282 + - 'for_each_reg_filtered' 347 283 - 'for_each_registered_fb' 348 284 - 'for_each_requested_gpio' 349 285 - 'for_each_requested_gpio_in_range' ··· 355 287 - 'for_each_rtd_components' 356 288 - 'for_each_rtd_cpu_dais' 357 289 - 'for_each_rtd_dais' 290 + - 'for_each_script' 291 + - 'for_each_sec' 358 292 - 'for_each_set_bit' 359 293 - 'for_each_set_bit_from' 294 + - 'for_each_set_bitrange' 295 + - 'for_each_set_bitrange_from' 360 296 - 'for_each_set_clump8' 361 297 - 'for_each_sg' 362 298 - 'for_each_sg_dma_page' ··· 369 297 - 'for_each_sgtable_dma_sg' 370 298 - 'for_each_sgtable_page' 371 299 - 'for_each_sgtable_sg' 300 + - 'for_each_shell_test' 372 301 - 'for_each_sibling_event' 373 302 - 'for_each_subelement' 374 303 - 'for_each_subelement_extid' 375 304 - 'for_each_subelement_id' 376 - - '__for_each_thread' 305 + - 'for_each_sublist' 306 + - 'for_each_subsystem' 307 + - 'for_each_supported_activate_fn' 308 + - 'for_each_supported_inject_fn' 309 + - 'for_each_test' 377 310 - 'for_each_thread' 311 + - 'for_each_token' 378 312 - 'for_each_unicast_dest_pgid' 379 313 - 'for_each_vsi' 380 314 - 'for_each_wakeup_source' 381 315 - 'for_each_zone' 382 316 - 'for_each_zone_zonelist' 383 317 - 'for_each_zone_zonelist_nodemask' 318 + - 'func_for_each_insn' 384 319 - 'fwnode_for_each_available_child_node' 385 320 - 'fwnode_for_each_child_node' 386 321 - 'fwnode_graph_for_each_endpoint' ··· 401 322 - 'hash_for_each_possible_safe' 402 323 - 'hash_for_each_rcu' 403 324 - 'hash_for_each_safe' 325 + - 'hashmap__for_each_entry' 326 + - 'hashmap__for_each_entry_safe' 327 + - 'hashmap__for_each_key_entry' 328 + - 'hashmap__for_each_key_entry_safe' 404 329 - 'hctx_for_each_ctx' 330 + - 'hists__for_each_format' 331 + - 'hists__for_each_sort_list' 405 332 - 'hlist_bl_for_each_entry' 406 333 - 'hlist_bl_for_each_entry_rcu' 407 334 - 'hlist_bl_for_each_entry_safe' ··· 423 338 - 'hlist_for_each_entry_rcu_notrace' 424 339 - 'hlist_for_each_entry_safe' 425 340 - 'hlist_for_each_entry_srcu' 426 - - '__hlist_for_each_rcu' 427 341 - 'hlist_for_each_safe' 428 342 - 'hlist_nulls_for_each_entry' 429 343 - 'hlist_nulls_for_each_entry_from' ··· 430 346 - 'hlist_nulls_for_each_entry_safe' 431 347 - 'i3c_bus_for_each_i2cdev' 432 348 - 'i3c_bus_for_each_i3cdev' 433 - - 'ide_host_for_each_port' 434 - - 'ide_port_for_each_dev' 435 - - 'ide_port_for_each_present_dev' 436 349 - 'idr_for_each_entry' 437 350 - 'idr_for_each_entry_continue' 438 351 - 'idr_for_each_entry_continue_ul' ··· 437 356 - 'in_dev_for_each_ifa_rcu' 438 357 - 'in_dev_for_each_ifa_rtnl' 439 358 - 'inet_bind_bucket_for_each' 359 + - 'inet_lhash2_for_each_icsk' 360 + - 'inet_lhash2_for_each_icsk_continue' 440 361 - 'inet_lhash2_for_each_icsk_rcu' 362 + - 'intlist__for_each_entry' 363 + - 'intlist__for_each_entry_safe' 364 + - 'kcore_copy__for_each_phdr' 441 365 - 'key_for_each' 442 366 - 'key_for_each_safe' 443 367 - 'klp_for_each_func' ··· 453 367 - 'klp_for_each_object_static' 454 368 - 'kunit_suite_for_each_test_case' 455 369 - 'kvm_for_each_memslot' 370 + - 'kvm_for_each_memslot_in_gfn_range' 456 371 - 'kvm_for_each_vcpu' 372 + - 'libbpf_nla_for_each_attr' 457 373 - 'list_for_each' 458 374 - 'list_for_each_codec' 459 375 - 'list_for_each_codec_safe' ··· 475 387 - 'list_for_each_entry_safe_from' 476 388 - 'list_for_each_entry_safe_reverse' 477 389 - 'list_for_each_entry_srcu' 390 + - 'list_for_each_from' 478 391 - 'list_for_each_prev' 479 392 - 'list_for_each_prev_safe' 480 393 - 'list_for_each_safe' ··· 483 394 - 'llist_for_each_entry' 484 395 - 'llist_for_each_entry_safe' 485 396 - 'llist_for_each_safe' 397 + - 'map__for_each_symbol' 398 + - 'map__for_each_symbol_by_name' 399 + - 'map_for_each_event' 400 + - 'map_for_each_metric' 401 + - 'maps__for_each_entry' 402 + - 'maps__for_each_entry_safe' 486 403 - 'mci_for_each_dimm' 487 404 - 'media_device_for_each_entity' 488 405 - 'media_device_for_each_intf' 489 406 - 'media_device_for_each_link' 490 407 - 'media_device_for_each_pad' 408 + - 'msi_for_each_desc' 491 409 - 'nanddev_io_for_each_page' 492 410 - 'netdev_for_each_lower_dev' 493 411 - 'netdev_for_each_lower_private' ··· 519 423 - 'pcl_for_each_chunk' 520 424 - 'pcl_for_each_segment' 521 425 - 'pcm_for_each_format' 426 + - 'perf_config_items__for_each_entry' 427 + - 'perf_config_sections__for_each_entry' 428 + - 'perf_config_set__for_each_entry' 429 + - 'perf_cpu_map__for_each_cpu' 430 + - 'perf_evlist__for_each_entry' 431 + - 'perf_evlist__for_each_entry_reverse' 432 + - 'perf_evlist__for_each_entry_safe' 433 + - 'perf_evlist__for_each_evsel' 434 + - 'perf_evlist__for_each_mmap' 435 + - 'perf_hpp_list__for_each_format' 436 + - 'perf_hpp_list__for_each_format_safe' 437 + - 'perf_hpp_list__for_each_sort_list' 438 + - 'perf_hpp_list__for_each_sort_list_safe' 439 + - 'perf_pmu__for_each_hybrid_pmu' 522 440 - 'ping_portaddr_for_each_entry' 523 441 - 'plist_for_each' 524 442 - 'plist_for_each_continue' ··· 552 442 - 'rdma_for_each_block' 553 443 - 'rdma_for_each_port' 554 444 - 'rdma_umem_for_each_dma_block' 445 + - 'resort_rb__for_each_entry' 555 446 - 'resource_list_for_each_entry' 556 447 - 'resource_list_for_each_entry_safe' 557 448 - 'rhl_for_each_entry_rcu' ··· 566 455 - 'rht_for_each_from' 567 456 - 'rht_for_each_rcu' 568 457 - 'rht_for_each_rcu_from' 569 - - '__rq_for_each_bio' 570 458 - 'rq_for_each_bvec' 571 459 - 'rq_for_each_segment' 460 + - 'rq_list_for_each' 461 + - 'rq_list_for_each_safe' 572 462 - 'scsi_for_each_prot_sg' 573 463 - 'scsi_for_each_sg' 574 464 - 'sctp_for_each_hentry' 575 465 - 'sctp_skb_for_each' 466 + - 'sec_for_each_insn' 467 + - 'sec_for_each_insn_continue' 468 + - 'sec_for_each_insn_from' 576 469 - 'shdma_for_each_chan' 577 - - '__shost_for_each_device' 578 470 - 'shost_for_each_device' 579 471 - 'sk_for_each' 580 472 - 'sk_for_each_bound' ··· 594 480 - 'snd_soc_dapm_widget_for_each_path_safe' 595 481 - 'snd_soc_dapm_widget_for_each_sink_path' 596 482 - 'snd_soc_dapm_widget_for_each_source_path' 483 + - 'strlist__for_each_entry' 484 + - 'strlist__for_each_entry_safe' 485 + - 'sym_for_each_insn' 486 + - 'sym_for_each_insn_continue_reverse' 487 + - 'symbols__for_each_entry' 597 488 - 'tb_property_for_each' 489 + - 'tcf_act_for_each_action' 598 490 - 'tcf_exts_for_each_action' 599 491 - 'udp_portaddr_for_each_entry' 600 492 - 'udp_portaddr_for_each_entry_rcu' ··· 624 504 - 'xbc_node_for_each_array_value' 625 505 - 'xbc_node_for_each_child' 626 506 - 'xbc_node_for_each_key_value' 507 + - 'xbc_node_for_each_subkey' 627 508 - 'zorro_for_each_dev' 628 509 629 - #IncludeBlocks: Preserve # Unknown to clang-format-5.0 510 + IncludeBlocks: Preserve 630 511 IncludeCategories: 631 512 - Regex: '.*' 632 513 Priority: 1 633 514 IncludeIsMainRegex: '(Test)?$' 634 515 IndentCaseLabels: false 635 - #IndentPPDirectives: None # Unknown to clang-format-5.0 516 + IndentGotoLabels: false 517 + IndentPPDirectives: None 636 518 IndentWidth: 8 637 519 IndentWrappedFunctionNames: false 638 520 JavaScriptQuotes: Leave ··· 644 522 MacroBlockEnd: '' 645 523 MaxEmptyLinesToKeep: 1 646 524 NamespaceIndentation: None 647 - #ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0 525 + ObjCBinPackProtocolList: Auto 648 526 ObjCBlockIndentWidth: 8 649 527 ObjCSpaceAfterProperty: true 650 528 ObjCSpaceBeforeProtocolList: true 651 529 652 530 # Taken from git's rules 653 - #PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0 531 + PenaltyBreakAssignment: 10 654 532 PenaltyBreakBeforeFirstCallParameter: 30 655 533 PenaltyBreakComment: 10 656 534 PenaltyBreakFirstLessLess: 0 ··· 661 539 PointerAlignment: Right 662 540 ReflowComments: false 663 541 SortIncludes: false 664 - #SortUsingDeclarations: false # Unknown to clang-format-4.0 542 + SortUsingDeclarations: false 665 543 SpaceAfterCStyleCast: false 666 544 SpaceAfterTemplateKeyword: true 667 545 SpaceBeforeAssignmentOperators: true 668 - #SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0 669 - #SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0 670 - SpaceBeforeParens: ControlStatements 671 - #SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0 546 + SpaceBeforeCtorInitializerColon: true 547 + SpaceBeforeInheritanceColon: true 548 + SpaceBeforeParens: ControlStatementsExceptForEachMacros 549 + SpaceBeforeRangeBasedForLoopColon: true 672 550 SpaceInEmptyParentheses: false 673 551 SpacesBeforeTrailingComments: 1 674 552 SpacesInAngles: false