From 771b14cd0a09c758aaa6701dab1b42955b8bbae6 Mon Sep 17 00:00:00 2001
From: QuantumEntangledAndy <sheepchaan@gmail.com>
Date: Tue, 3 Aug 2021 10:52:50 +0700
Subject: [PATCH 1/2] Improve workspace handelling

- Use `cargo locate-project --workspace` to find workspace manifiest
- Add `cargo all` which checks all workspaces and all targets
- Fix issue with paths relative to the cargo manifest root
---
 lib/init.coffee        |  2 ++
 lib/linter-rust.coffee | 29 +++++++++++++++++++++++++++--
 lib/mode.coffee        |  3 ++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/lib/init.coffee b/lib/init.coffee
index cd08abd..2499a2d 100644
--- a/lib/init.coffee
+++ b/lib/init.coffee
@@ -26,6 +26,7 @@ module.exports =
         'test all'
         'rustc'
         'clippy'
+        'clippy all'
       ]
       description: """`cargo` command to run.<ul>
       <li>Use **build** to simply compile the code.</li>
@@ -33,6 +34,7 @@ module.exports =
       <li>Use **check all** for fast linting of all packages in the project.</li>
       <li>Use **check tests** to also include \`#[cfg(test)]\` code in linting.</li>
       <li>Use **clippy** to increase amount of available lints (you need to install \`clippy\`).</li>
+      <li>Use **clippy all** to increase amount of available lints (you need to install \`clippy\`) for all packages in the project.</li>
       <li>Use **test** to run tests (note that once the tests are built, lints stop showing).</li>
       <li>Use **test all** run tests for all packages in the project.</li>
       <li>Use **rustc** for linting with Rust pre-1.23.</li>
diff --git a/lib/linter-rust.coffee b/lib/linter-rust.coffee
index 3d91bbb..34e3b68 100644
--- a/lib/linter-rust.coffee
+++ b/lib/linter-rust.coffee
@@ -32,6 +32,7 @@ class LinterRust
     @subscriptions.add atom.config.observe 'linter-rust.cargoCommand',
     (cargoCommand) =>
       @cargoCommand = cargoCommand
+      @useWorkspaceManifest = cargoCommand.endsWith('all')
 
     @subscriptions.add atom.config.observe 'linter-rust.rustcBuildTest',
     (rustcBuildTest) =>
@@ -75,6 +76,8 @@ class LinterRust
       cmdPath = if cmd[0]? then path.dirname cmd[0] else __dirname
       args = cmd.slice 1
       env.PATH = cmdPath + path.delimiter + env.PATH
+      cargoManifestFile = @locateCargo curDir
+      cargoManifestDir = path.dirname cargoManifestFile
 
       # we set flags only for intermediate json support
       if errorMode == errorModes.FLAGS_JSON_CARGO
@@ -116,7 +119,8 @@ class LinterRust
             # correct file paths
             messages.forEach (message) ->
               if !(path.isAbsolute message.location.file)
-                message.location.file = path.join curDir, message.location.file
+                message.location.file = path.join curDir, message.location.file if fs.existsSync path.join curDir, message.location.file
+                message.location.file = path.join cargoManifestDir, message.location.file if fs.existsSync path.join cargoManifestDir, message.location.file
             messages
           else
             # whoops, we're in trouble -- let's output as much as we can
@@ -199,8 +203,29 @@ class LinterRust
   locateCargo: (curDir) =>
     root_dir = if /^win/.test process.platform then /^.:\\$/ else /^\/$/
     directory = path.resolve curDir
+    manifest_name = @cargoManifestFilename
+
     loop
-      return path.join directory, @cargoManifestFilename if fs.existsSync path.join directory, @cargoManifestFilename
+      if fs.existsSync path.join directory, manifest_name
+        crate_level_manifest = path.join directory , manifest_name
+
+        if @useWorkspaceManifest
+          execOpts =
+            env: JSON.parse JSON.stringify process.env
+            cwd: curDir
+            stream: 'both'
+
+          atom_linter.exec('cargo', ['locate-project', '--workspace', '--manifest-path=' + crate_level_manifest], execOpts)
+            .then (result) =>
+              {stdout, stderr, exitCode} = result
+              json = JSON.parse stdout
+              return  json.root
+            .catch (error) ->
+              return crate_level_manifest
+        else
+          return crate_level_manifest
+
+      return path.join directory , manifest_name if fs.existsSync path.join directory, manifest_name
       break if root_dir.test directory
       directory = path.resolve path.join(directory, '..')
     return false
diff --git a/lib/mode.coffee b/lib/mode.coffee
index 50f96a6..ce4b06f 100644
--- a/lib/mode.coffee
+++ b/lib/mode.coffee
@@ -165,7 +165,7 @@ buildCargoArguments = (linter, cargoManifestPath) ->
               .catch ->
                 result: false
       usingMultitoolForClippy.then (canUseMultirust) ->
-        if cargoCommand == 'clippy' and canUseMultirust.result
+        if (cargoCommand == 'clippy' or cargoCommand == 'clippy all') and canUseMultirust.result
           [canUseMultirust.tool, 'run', 'nightly', 'cargo']
         else
           [cargoPath]
@@ -181,6 +181,7 @@ buildCargoArguments = (linter, cargoManifestPath) ->
     when 'test all' then ['test', '--no-run', '--all']
     when 'rustc' then ['rustc', '--color', 'never']
     when 'clippy' then ['clippy']
+    when 'clippy all' then ['clippy', '--workspace', '--all-targets']
     else ['build']
 
   compilationFeatures = linter.compilationFeatures(true)

From 1e1e537dc2975e6a0a97d098e4f3124bb50bb091 Mon Sep 17 00:00:00 2001
From: QuantumEntangledAndy <sheepchaan@gmail.com>
Date: Tue, 3 Aug 2021 12:36:17 +0700
Subject: [PATCH 2/2] Add all targets to the all commands so that they check
 all binaries tests and examples

---
 lib/linter-rust.coffee | 82 +++++++++++++++++++++++-------------------
 lib/mode.coffee        |  4 +--
 2 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/lib/linter-rust.coffee b/lib/linter-rust.coffee
index 34e3b68..9d20a63 100644
--- a/lib/linter-rust.coffee
+++ b/lib/linter-rust.coffee
@@ -76,8 +76,9 @@ class LinterRust
       cmdPath = if cmd[0]? then path.dirname cmd[0] else __dirname
       args = cmd.slice 1
       env.PATH = cmdPath + path.delimiter + env.PATH
-      cargoManifestFile = @locateCargo curDir
-      cargoManifestDir = path.dirname cargoManifestFile
+      editingDir = path.dirname textEditor.getPath()
+      cargoWorkspaceManifestFile = @locateCargoWorkspace editingDir
+      cargoCrateManifestFile = @locateCargoCrate editingDir
 
       # we set flags only for intermediate json support
       if errorMode == errorModes.FLAGS_JSON_CARGO
@@ -91,8 +92,14 @@ class LinterRust
         stream: 'both'
       execOpts.timeout = Infinity if @disableExecTimeout
 
-      atom_linter.exec(command, args, execOpts)
-        .then (result) =>
+      Promise.all [atom_linter.exec(command, args, execOpts), cargoWorkspaceManifestFile]
+        .then (promiseReturns)  ->
+          result = promiseReturns[0]
+          cargoWorkspaceManifestFile = promiseReturns[1]
+
+          cargoCrateManifestDir = path.dirname cargoCrateManifestFile
+          cargoWorkspaceManifestDir = path.dirname cargoWorkspaceManifestFile
+
           {stdout, stderr, exitCode} = result
           # first, check if an output says specified features are invalid
           if stderr.indexOf('does not have these features') >= 0
@@ -120,7 +127,8 @@ class LinterRust
             messages.forEach (message) ->
               if !(path.isAbsolute message.location.file)
                 message.location.file = path.join curDir, message.location.file if fs.existsSync path.join curDir, message.location.file
-                message.location.file = path.join cargoManifestDir, message.location.file if fs.existsSync path.join cargoManifestDir, message.location.file
+                message.location.file = path.join cargoCrateManifestDir, message.location.file if fs.existsSync path.join cargoCrateManifestDir, message.location.file
+                message.location.file = path.join cargoWorkspaceManifestDir, message.location.file if fs.existsSync path.join cargoWorkspaceManifestDir, message.location.file
             messages
           else
             # whoops, we're in trouble -- let's output as much as we can
@@ -141,15 +149,15 @@ class LinterRust
 
   initCmd: (editingFile) =>
     curDir = if editingFile? then path.dirname editingFile else __dirname
-    cargoManifestPath = @locateCargo curDir
-    if not @useCargo or not cargoManifestPath
-      @decideErrorMode(curDir, 'rustc').then (mode) =>
-        mode.buildArguments(this, [editingFile, cargoManifestPath]).then (cmd) ->
-          [cmd, mode]
-    else
-      @decideErrorMode(curDir, 'cargo').then (mode) =>
-        mode.buildArguments(this, cargoManifestPath).then (cmd) ->
-          [cmd, mode]
+    @locateCargo(curDir).then (cargoManifestPath) =>
+      if not @useCargo or not cargoManifestPath
+        @decideErrorMode(curDir, 'rustc').then (mode) =>
+          mode.buildArguments(this, [editingFile, cargoManifestPath]).then (cmd) ->
+            [cmd, mode]
+      else
+        @decideErrorMode(curDir, 'cargo').then (mode) =>
+          mode.buildArguments(this, cargoManifestPath).then (cmd) ->
+            [cmd, mode]
 
   compilationFeatures: (cargo) =>
     if @specifiedFeatures.length > 0
@@ -200,34 +208,34 @@ class LinterRust
         @cachedErrorMode = result
         result
 
-  locateCargo: (curDir) =>
+  locateCargoCrate: (curDir) =>
     root_dir = if /^win/.test process.platform then /^.:\\$/ else /^\/$/
     directory = path.resolve curDir
-    manifest_name = @cargoManifestFilename
-
     loop
-      if fs.existsSync path.join directory, manifest_name
-        crate_level_manifest = path.join directory , manifest_name
-
-        if @useWorkspaceManifest
-          execOpts =
-            env: JSON.parse JSON.stringify process.env
-            cwd: curDir
-            stream: 'both'
-
-          atom_linter.exec('cargo', ['locate-project', '--workspace', '--manifest-path=' + crate_level_manifest], execOpts)
-            .then (result) =>
-              {stdout, stderr, exitCode} = result
-              json = JSON.parse stdout
-              return  json.root
-            .catch (error) ->
-              return crate_level_manifest
-        else
-          return crate_level_manifest
-
-      return path.join directory , manifest_name if fs.existsSync path.join directory, manifest_name
+      return path.join directory , @cargoManifestFilename if fs.existsSync path.join directory, @cargoManifestFilename
       break if root_dir.test directory
       directory = path.resolve path.join(directory, '..')
     return false
 
+  locateCargoWorkspace: (curDir) =>
+    crate_level_manifest = @locateCargoCrate(curDir)
+    if @useWorkspaceManifest and @useCargo
+      execOpts =
+        env: JSON.parse JSON.stringify process.env
+        cwd: curDir
+        stream: 'both'
+
+      return atom_linter.exec('cargo', ['locate-project', '--workspace', '--manifest-path=' + crate_level_manifest], execOpts)
+        .then (result) =>
+          {stdout, stderr, exitCode} = result
+          json = JSON.parse stdout
+          return  json.root
+        .catch (error) ->
+          return crate_level_manifest
+    else
+      return crate_level_manifest
+
+  locateCargo: (curDir) =>
+    return @locateCargoWorkspace curDir
+
 module.exports = LinterRust
diff --git a/lib/mode.coffee b/lib/mode.coffee
index ce4b06f..d2df0a8 100644
--- a/lib/mode.coffee
+++ b/lib/mode.coffee
@@ -175,10 +175,10 @@ buildCargoArguments = (linter, cargoManifestPath) ->
 
   cargoArgs = switch linter.cargoCommand
     when 'check' then ['check']
-    when 'check all' then ['check', '--all']
+    when 'check all' then ['check', '--all', '--all-targets']
     when 'check tests' then ['check', '--tests']
     when 'test' then ['test', '--no-run']
-    when 'test all' then ['test', '--no-run', '--all']
+    when 'test all' then ['test', '--no-run', '--all', '--all-targets']
     when 'rustc' then ['rustc', '--color', 'never']
     when 'clippy' then ['clippy']
     when 'clippy all' then ['clippy', '--workspace', '--all-targets']