Skip to content

Commit

Permalink
Merge branch 'master' into deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
PetarKirov authored Mar 7, 2023
2 parents d7212d7 + 68ca041 commit 78cbf41
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 6 deletions.
19 changes: 16 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
# EditorConfig file: http://EditorConfig.org
root = true

[*.{c,h,d,di,dd}]
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 2
max_line_length = 80

[*.{d,h,hpp,c,cpp,cxx,cs,hs,java,kt,py,rs,sol}]
indent_size = 4
trim_trailing_whitespace = true
charset = utf-8

[{Makefile,go.mod,go.sum,*.go,.gitmodules}]
indent_style = tab
indent_size = 4

[{CMakeLists.txt,*.cmake}]
indent_size = 2
indent_style = space
31 changes: 31 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: CI

on:
workflow_dispatch:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
test:
name: "[${{ matrix.os }} | ${{ matrix.dc }}]"
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
dc: [dmd-latest, ldc-latest]
arch: [x86_64]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3

- name: Install D compiler
uses: dlang-community/setup-dlang@v1
with:
compiler: ${{ matrix.dc }}
- name: Run tests
env:
DC: ${{matrix.dc}}
ARCH: ${{matrix.arch}}
run: |
dub test
2 changes: 1 addition & 1 deletion source/stdx/data/json/generator.d
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void writeJSON(GeneratorOptions options = GeneratorOptions.init, Output, Input)(
}
}
/// ditto
void writeJSON(GeneratorOptions options = GeneratorOptions.init, String, Output)(in ref JSONToken!String token, ref Output output)
void writeJSON(GeneratorOptions options = GeneratorOptions.init, String, Output)(const ref JSONToken!String token, ref Output output)
if (isOutputRange!(Output, char))
{
final switch (token.kind) with (JSONTokenKind)
Expand Down
2 changes: 1 addition & 1 deletion source/stdx/data/json/lexer.d
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ struct JSONLexerRange(Input, LexOptions options = LexOptions.init, String = stri
* Note that the location is considered token meta data and thus does not
* affect the comparison.
*/
bool opEquals(in ref JSONToken other) const nothrow @trusted
bool opEquals(const ref JSONToken other) const nothrow @trusted
{
if (this.kind != other.kind) return false;

Expand Down
2 changes: 1 addition & 1 deletion source/stdx/data/json/parser.d
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ struct JSONParserNode(String)
* Note that the location is considered part of the token and thus is
* included in the comparison.
*/
bool opEquals(in ref JSONParserNode other)
bool opEquals(const ref JSONParserNode other)
const nothrow
{
if (this.kind != other.kind) return false;
Expand Down

0 comments on commit 78cbf41

Please sign in to comment.