Merge pull request #1007 from rust-lang/rustfmt-channel

Use the currently selected channel to format code

Author: shepmaster

ui/frontend/reducers/output/format.ts

@@ -1,4 +1,5 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import * as z from 'zod';
 
 import { adaptFetchError, jsonPost, routes } from '../../actions';
 import { formatRequestSelector } from '../../selectors';
@@ -17,23 +18,27 @@ interface State {
 }
 
 interface FormatRequestBody {
-  code: string;
+  channel: string;
   edition: string;
-}
-
-interface FormatResponseBody {
-  success: boolean;
   code: string;
-  stdout: string;
-  stderr: string;
 }
 
+const FormatResponseBody = z.object({
+  success: z.boolean(),
+  code: z.string(),
+  stdout: z.string(),
+  stderr: z.string(),
+});
+
+type FormatResponseBody = z.infer<typeof FormatResponseBody>;
+
 export const performFormat = createAsyncThunk<FormatResponseBody, void, { state: RootState }>(
   sliceName,
   async (_arg: void, { getState }) => {
     const body: FormatRequestBody = formatRequestSelector(getState());
 
-    return adaptFetchError(() => jsonPost<FormatResponseBody>(routes.format, body));
+    const d = await adaptFetchError(() => jsonPost(routes.format, body));
+    return FormatResponseBody.parseAsync(d);
   },
 );
 

ui/frontend/selectors/index.ts

@@ -99,10 +99,27 @@ const LABELS: { [index in PrimaryActionCore]: string } = {
 
 export const getExecutionLabel = createSelector(primaryActionSelector, primaryAction => LABELS[primaryAction]);
 
+const channelSelector = (state: State) => state.configuration.channel;
+
+const selectedChannelVersionsSelector = createSelector(
+  channelSelector,
+  (state: State) => state.versions,
+  (channel, versions) => {
+    switch (channel) {
+      case Channel.Stable:
+        return versions.stable;
+      case Channel.Beta:
+        return versions.beta;
+      case Channel.Nightly:
+        return versions.nightly;
+    }
+  },
+)
+
 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 = (state: State) => state.versions.nightly?.rustfmt;
+const getRustfmt = createSelector(selectedChannelVersionsSelector, (versions) => versions?.rustfmt);
 const getClippy = (state: State) => state.versions.nightly?.clippy;
 const getMiri = (state: State) => state.versions?.nightly?.miri;
 
@@ -123,8 +140,9 @@ export const miriVersionDetailsText = createSelector(getMiri, versionDetails);
 
 const editionSelector = (state: State) => state.configuration.edition;
 
-export const isNightlyChannel = (state: State) => (
-  state.configuration.channel === Channel.Nightly
+export const isNightlyChannel = createSelector(
+  channelSelector,
+  (channel) => channel === Channel.Nightly,
 );
 export const isHirAvailable = isNightlyChannel;
 
@@ -142,10 +160,7 @@ export const getModeLabel = (state: State) => {
   return `${mode}`;
 };
 
-export const getChannelLabel = (state: State) => {
-  const { configuration: { channel } } = state;
-  return `${channel}`;
-};
+export const getChannelLabel = createSelector(channelSelector, (channel) => `${channel}`);
 
 export const isEditionDefault = createSelector(
   editionSelector,
@@ -311,9 +326,10 @@ export const clippyRequestSelector = createSelector(
 );
 
 export const formatRequestSelector = createSelector(
-  codeSelector,
+  channelSelector,
   editionSelector,
-  (code, edition) => ({ code, edition }),
+  codeSelector,
+  (channel, edition, code) => ({ channel, edition, code }),
 );
 
 const focus = (state: State) => state.output.meta.focus;
@@ -387,11 +403,12 @@ export const websocketStatusSelector = createSelector(
 
 export const executeRequestPayloadSelector = createSelector(
   codeSelector,
+  channelSelector,
   (state: State) => state.configuration,
   getBacktraceSet,
   (_state: State, { crateType, tests }: { crateType: string, tests: boolean }) => ({ crateType, tests }),
-  (code, configuration, backtrace, { crateType, tests }) => ({
-    channel: configuration.channel,
+  (code, channel, configuration, backtrace, { crateType, tests }) => ({
+    channel,
     mode: configuration.mode,
     edition: configuration.edition,
     crateType,
@@ -403,13 +420,14 @@ export const executeRequestPayloadSelector = createSelector(
 
 export const compileRequestPayloadSelector = createSelector(
   codeSelector,
+  channelSelector,
   (state: State) => state.configuration,
   getCrateType,
   runAsTest,
   getBacktraceSet,
   (_state: State, { target }: { target: string }) => ({ target }),
-  (code, configuration, crateType, tests, backtrace, { target }) => ({
-    channel: configuration.channel,
+  (code, channel, configuration, crateType, tests, backtrace, { target }) => ({
+    channel,
     mode: configuration.mode,
     edition: configuration.edition,
     crateType,

ui/src/main.rs

@@ -355,9 +355,11 @@ struct ExecuteResponse {
 
 #[derive(Debug, Clone, Deserialize)]
 struct FormatRequest {
-    code: String,
+    #[serde(default)]
+    channel: Option<String>,
     #[serde(default)]
     edition: String,
+    code: String,
 }
 
 #[derive(Debug, Clone, Serialize)]

ui/src/server_axum.rs

@@ -1052,10 +1052,19 @@ pub(crate) mod api_orchestrator_integration_impls {
         type Error = ParseFormatRequestError;
 
         fn try_from(other: crate::FormatRequest) -> std::result::Result<Self, Self::Error> {
-            let crate::FormatRequest { code, edition } = other;
+            let crate::FormatRequest {
+                channel,
+                edition,
+                code,
+            } = other;
+
+            let channel = match channel {
+                Some(c) => parse_channel(&c)?,
+                None => Channel::Nightly,
+            };
 
             Ok(FormatRequest {
-                channel: Channel::Nightly,     // TODO: use what user has submitted
+                channel,
                 crate_type: CrateType::Binary, // TODO: use what user has submitted
                 edition: parse_edition(&edition)?,
                 code,
@@ -1065,6 +1074,9 @@ pub(crate) mod api_orchestrator_integration_impls {
 
     #[derive(Debug, Snafu)]
     pub(crate) enum ParseFormatRequestError {
+        #[snafu(context(false))]
+        Channel { source: ParseChannelError },
+
         #[snafu(context(false))]
         Edition { source: ParseEditionError },
     }