carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch to clang-format 14.0.6 (#2253)

Browse Source 
14.0.6 is the latest release at https://pypi.org/project/clang-format/#history, hopefully 15.0.0 will be out soon. Looks like ssciwr/clang-format-wheel#49 is noting issues for this particular release process though.
This commit is contained in:
Jon Ross-Perkins
2022-10-06 12:19:24 -07:00
committed by GitHub
parent 0b9bda10b7
commit 495d75a394
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.pre-commit-config.yaml
+2 -2
View File
@@ -71,14 +71,14 @@ repos:
types_or: [c++, proto]
language: python
args: ['-i']
additional_dependencies: ['clang-format==13.0.1']
additional_dependencies: ['clang-format==14.0.6']
- id: explorer-format-grammar
name: Format the explorer grammar file
entry: explorer/syntax/format_grammar.py
language: python
files: ^explorer/syntax/(lexer.lpp|parser.ypp)$
pass_filenames: false
additional_dependencies: ['clang-format==13.0.1']
additional_dependencies: ['clang-format==14.0.6']
- repo: local
hooks:
explorer/syntax/parser.ypp
+2 -3
View File
@@ -697,7 +697,7 @@ where_expression:
type_expression WHERE where_clause_list
{
auto* self =
arena -> New<GenericBinding>(context.source_loc(), ".Self", $1);
arena->New<GenericBinding>(context.source_loc(), ".Self", $1);
$$ = arena->New<WhereExpression>(context.source_loc(), self, $3);
}
;
@@ -1149,8 +1149,7 @@ declaration:
| MIXIN identifier type_params mixin_import LEFT_CURLY_BRACE mixin_body RIGHT_CURLY_BRACE
{
// EXPERIMENTAL MIXN FEATURE
auto self =
arena -> New<GenericBinding>(context.source_loc(), "Self", $4);
auto self = arena->New<GenericBinding>(context.source_loc(), "Self", $4);
$$ = arena->New<MixinDeclaration>(context.source_loc(), $2, $3, self, $6);
}
| CHOICE identifier type_params LEFT_CURLY_BRACE alternative_list RIGHT_CURLY_BRACE