Use the currently selected channel to execute Clippy

Author: shepmaster

ui/frontend/reducers/output/clippy.ts

@@ -19,9 +19,10 @@ interface State {
 }
 
 interface ClippyRequestBody {
-  code: string;
-  edition: string;
+  channel: string;
   crateType: string;
+  edition: string;
+  code: string;
 }
 
 const ClippyResponseBody = z.object({

ui/frontend/selectors/index.ts

@@ -120,7 +120,7 @@ const getStable = (state: State) => state.versions.stable?.rustc;
 const getBeta = (state: State) => state.versions.beta?.rustc;
 const getNightly = (state: State) => state.versions.nightly?.rustc;
 const getRustfmt = createSelector(selectedChannelVersionsSelector, (versions) => versions?.rustfmt);
-const getClippy = (state: State) => state.versions.nightly?.clippy;
+const getClippy = createSelector(selectedChannelVersionsSelector, (versions) => versions?.clippy);
 const getMiri = (state: State) => state.versions?.nightly?.miri;
 
 const versionNumber = (v: Version | undefined) => v ? v.version : '';
@@ -319,10 +319,11 @@ export const anyNotificationsToShowSelector = createSelector(
 );
 
 export const clippyRequestSelector = createSelector(
-  codeSelector,
-  editionSelector,
+  channelSelector,
   getCrateType,
-  (code, edition, crateType) => ({ code, edition, crateType }),
+  editionSelector,
+  codeSelector,
+  (channel, crateType, edition, code) => ({ channel, crateType, edition, code }),
 );
 
 export const formatRequestSelector = createSelector(

ui/src/main.rs

@@ -374,11 +374,13 @@ struct FormatResponse {
 
 #[derive(Debug, Clone, Deserialize)]
 struct ClippyRequest {
-    code: String,
     #[serde(default)]
-    edition: String,
+    channel: Option<String>,
     #[serde(default = "default_crate_type", rename = "crateType")]
     crate_type: String,
+    #[serde(default)]
+    edition: String,
+    code: String,
 }
 
 #[derive(Debug, Clone, Serialize)]

ui/src/server_axum.rs

@@ -1109,13 +1109,19 @@ pub(crate) mod api_orchestrator_integration_impls {
 
         fn try_from(other: crate::ClippyRequest) -> std::result::Result<Self, Self::Error> {
             let crate::ClippyRequest {
-                code,
-                edition,
+                channel,
                 crate_type,
+                edition,
+                code,
             } = other;
 
+            let channel = match channel {
+                Some(c) => parse_channel(&c)?,
+                None => Channel::Nightly,
+            };
+
             Ok(ClippyRequest {
-                channel: Channel::Nightly, // TODO: use what user has submitted
+                channel,
                 crate_type: parse_crate_type(&crate_type)?,
                 edition: parse_edition(&edition)?,
                 code,
@@ -1126,10 +1132,13 @@ pub(crate) mod api_orchestrator_integration_impls {
     #[derive(Debug, Snafu)]
     pub(crate) enum ParseClippyRequestError {
         #[snafu(context(false))]
-        Edition { source: ParseEditionError },
+        Channel { source: ParseChannelError },
 
         #[snafu(context(false))]
         CrateType { source: ParseCrateTypeError },
+
+        #[snafu(context(false))]
+        Edition { source: ParseEditionError },
     }
 
     impl From<WithOutput<ClippyResponse>> for crate::ClippyResponse {