CI improvement (#674)

.github/workflows/cargo.yml

@@ -1,15 +1,16 @@
 name: Cargo
 
-on:
-  push:
-    # Ignore commits created by bors
-    branches-ignore:
-      - 'staging'
-      - 'trying'
-  pull_request:
-    branches-ignore:
-      - 'staging'
-      - 'trying'
+on: push
+#on:
+#  push:
+#    # Ignore commits created by bors
+#    branches-ignore:
+#      - 'staging'
+#      - 'trying'
+#  pull_request:
+#    branches-ignore:
+#      - 'staging'
+#      - 'trying'
 
 env:
   RUST_MIN_STACK: 16777216

bors.toml

@@ -1,6 +1,6 @@
 status = [
 #  "fmt",
 #  "test-debug",
-  "continuous-integration/travis-ci/push"
+  "%"
 ]
 use_squash_merge = true

common/src/source_map.rs

@@ -180,7 +180,7 @@ impl SourceMap {
             None => self.start_pos.fetch_add(len + 1, SeqCst),
             // Add one so there is some space between files. This lets us distinguish
             // positions in the source_map, even in the presence of zero-length files.
-            Some(last) => self.start_pos.fetch_add(len + 1, SeqCst),
+            Some(..) => self.start_pos.fetch_add(len + 1, SeqCst),
         }
     }