Merge #42

bors[bot] · vchuravy · web-flow · commit 491191806976 · 2020-02-29T09:02:05.000Z
42: Fix tuple destructuring and bors+travis r=vchuravy a=vchuravy

bors r+

Co-authored-by: Valentin Churavy &lt;v.churavy@gmail.com&gt;
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,8 @@ language: julia
 branches:
   only:
   - master
+  - staging
+  - trying
 os:
   - linux
   - osx
@@ -15,3 +17,7 @@ notifications:
   email: false
 git:
   depth: 99999999
+jobs:
+  allow_failures:
+    - julia: 1.4
+    - julia: nightly
diff --git a/bors.toml b/bors.toml
@@ -1,3 +1,4 @@
 status = [
-  "ci/gitlab/%"
+  "ci/gitlab/%",
+  "continuous-integration/travis-ci/push"
 ]
diff --git a/src/KernelAbstractions.jl b/src/KernelAbstractions.jl
@@ -181,7 +181,6 @@ macro index(locale, args...)
     end
 
     if length(args) >= 1
-
         if args[1] === :Cartesian ||
            args[1] === :Linear ||
            args[1] === :NTuple
diff --git a/src/macros.jl b/src/macros.jl
@@ -160,7 +160,7 @@ function split(stmts,
         if @capture(stmt, @uniform x_)
             push!(allocations, stmt)
             continue
-        elseif @capture(stmt, lhs_ = rhs_)
+        elseif @capture(stmt, lhs_ = rhs_ | (vs__, lhs_ = rhs_))
             if @capture(rhs, @index(args__))
                 push!(indicies, stmt)
                 continue

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`status = [`
`2`		`- "ci/gitlab/%"`
	`2`	`+ "ci/gitlab/%",`
	`3`	`+ "continuous-integration/travis-ci/push"`
`3`	`4`	`]`