Merge remote-tracking branch 'origin/master' into completion2

rust-lang · Jun 30, 2022 · 3410102 · 3410102
2 parents eaecaaf + b0102bd
commit 3410102
Show file tree

Hide file tree

Showing 180 changed files with 9,704 additions and 3,839 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -246,13 +246,24 @@ jobs:
       - run: npm ci
         working-directory: ./editors/code
 
-      - name: Publish Extension (release)
+      - name: Publish Extension (Code Marketplace, release)
         if: github.ref == 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer')
         working-directory: ./editors/code
         # token from https://dev.azure.com/rust-analyzer/
         run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix
 
-      - name: Publish Extension (nightly)
+      - name: Publish Extension (OpenVSX, release)
+        if: github.ref == 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer')
+        working-directory: ./editors/code
+        # token from https://dev.azure.com/rust-analyzer/
+        run: npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix
+
+      - name: Publish Extension (Code Marketplace, nightly)
         if: github.ref != 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer')
         working-directory: ./editors/code
         run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix --pre-release
+
+      - name: Publish Extension (OpenVSX, nightly)
+        if: github.ref != 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer')
+        working-directory: ./editors/code
+        run: npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix --pre-release
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/base-db/src/fixture.rs b/crates/base-db/src/fixture.rs
@@ -159,7 +159,7 @@ impl ChangeFixture {
                     meta.cfg.clone(),
                     meta.cfg,
                     meta.env,
-                    Default::default(),
+                    Ok(Vec::new()),
                     false,
                     origin,
                 );
@@ -194,7 +194,7 @@ impl ChangeFixture {
                 default_cfg.clone(),
                 default_cfg,
                 Env::default(),
-                Default::default(),
+                Ok(Vec::new()),
                 false,
                 CrateOrigin::CratesIo { repo: None },
             );
@@ -231,7 +231,7 @@ impl ChangeFixture {
                 CfgOptions::default(),
                 CfgOptions::default(),
                 Env::default(),
-                Vec::new(),
+                Ok(Vec::new()),
                 false,
                 CrateOrigin::Lang(LangCrateOrigin::Core),
             );
@@ -268,7 +268,7 @@ impl ChangeFixture {
                 CfgOptions::default(),
                 CfgOptions::default(),
                 Env::default(),
-                proc_macro,
+                Ok(proc_macro),
                 true,
                 CrateOrigin::CratesIo { repo: None },
             );