Remove Action / ActionType / ThunkAction

We rename `SimpleThunkAction` to `ThunkAction` as there's no ambiguity
now.

Author: shepmaster

ui/frontend/BuildMenu.tsx

@@ -14,7 +14,7 @@ interface BuildMenuProps {
   close: () => void;
 }
 
-const useDispatchAndClose = (action: () => actions.SimpleThunkAction, close: () => void) => {
+const useDispatchAndClose = (action: () => actions.ThunkAction, close: () => void) => {
   const dispatch = useAppDispatch();
 
   return useCallback(() => {

ui/frontend/actions.ts

@@ -19,7 +19,7 @@ import {
   parseMode,
 } from './types';
 
-import { performCommonExecute, wsExecuteRequest } from './reducers/output/execute';
+import { performCommonExecute } from './reducers/output/execute';
 import { performGistLoad } from './reducers/output/gist';
 import { performCompileToAssemblyOnly } from './reducers/output/assembly';
 import { performCompileToHirOnly } from './reducers/output/hir';
@@ -36,10 +36,7 @@ import {
   changePrimaryAction,
 } from './reducers/configuration';
 
-export type ThunkAction<T = void> = ReduxThunkAction<T, State, {}, Action>;
-export type SimpleThunkAction<T = void> = ReduxThunkAction<T, State, {}, AnyAction>;
-
-export enum ActionType {}
+export type ThunkAction<T = void> = ReduxThunkAction<T, State, {}, AnyAction>;
 
 export const reExecuteWithBacktrace = (): ThunkAction => dispatch => {
   dispatch(changeBacktrace(Backtrace.Enabled));
@@ -164,15 +161,3 @@ export function showExample(code: string): ThunkAction {
     dispatch(editCode(code));
   };
 }
-
-export type Action =
-  | ReturnType<typeof changeBacktrace>
-  | ReturnType<typeof changeChannel>
-  | ReturnType<typeof changeEditionRaw>
-  | ReturnType<typeof changeMode>
-  | ReturnType<typeof changePrimaryAction>
-  | ReturnType<typeof editCode>
-  | ReturnType<typeof addCrateType>
-  | ReturnType<typeof navigateToIndex>
-  | ReturnType<typeof wsExecuteRequest>
-  ;

ui/frontend/compileActions.ts

@@ -1,7 +1,7 @@
 import { AsyncThunk, createAsyncThunk } from '@reduxjs/toolkit';
 import * as z from 'zod';
 
-import { SimpleThunkAction } from './actions';
+import { ThunkAction } from './actions';
 import { jsonPost, routes } from './api';
 import { compileRequestPayloadSelector } from './selectors';
 
@@ -33,7 +33,7 @@ interface Props {
 
 interface CompileActions {
   action: AsyncThunk<CompileResponseBody, CompileRequestBody, {}>;
-  performCompile: () => SimpleThunkAction;
+  performCompile: () => ThunkAction;
 }
 
 export const makeCompileActions = ({ sliceName, target }: Props): CompileActions => {
@@ -42,7 +42,7 @@ export const makeCompileActions = ({ sliceName, target }: Props): CompileActions
     return CompileResponseBody.parseAsync(d);
   });
 
-  const performCompile = (): SimpleThunkAction => (dispatch, getState) => {
+  const performCompile = (): ThunkAction => (dispatch, getState) => {
     const state = getState();
     const body = compileRequestPayloadSelector(state, { target });
     dispatch(action(body));

ui/frontend/reducers/configuration.ts

@@ -1,6 +1,6 @@
 import { PayloadAction, createSlice } from '@reduxjs/toolkit';
 
-import { SimpleThunkAction } from '../actions';
+import { ThunkAction } from '../actions';
 import {
   AssemblyFlavor,
   Backtrace,
@@ -138,7 +138,7 @@ export const {
 } = slice.actions;
 
 export const changeEdition =
-  (edition: Edition): SimpleThunkAction =>
+  (edition: Edition): ThunkAction =>
   (dispatch) => {
     if (edition === Edition.Rust2024) {
       dispatch(changeChannel(Channel.Nightly));

ui/frontend/reducers/output/execute.ts

@@ -1,7 +1,7 @@
 import { AnyAction, Draft, createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import * as z from 'zod';
 
-import { SimpleThunkAction } from '../../actions';
+import { ThunkAction } from '../../actions';
 import { jsonPost, routes } from '../../api';
 import { executeRequestPayloadSelector, executeViaWebsocketSelector } from '../../selectors';
 import { Channel, Edition, Mode } from '../../types';
@@ -194,7 +194,7 @@ const slice = createSlice({
 export const { wsExecuteRequest } = slice.actions;
 
 export const performCommonExecute =
-  (crateType: string, tests: boolean): SimpleThunkAction =>
+  (crateType: string, tests: boolean): ThunkAction =>
   (dispatch, getState) => {
     const state = getState();
     const body = executeRequestPayloadSelector(state, { crateType, tests });
@@ -208,7 +208,7 @@ export const performCommonExecute =
   };
 
 const dispatchWhenSequenceNumber =
-  <A extends AnyAction>(cb: (sequenceNumber: number) => A): SimpleThunkAction =>
+  <A extends AnyAction>(cb: (sequenceNumber: number) => A): ThunkAction =>
   (dispatch, getState) => {
     const state = getState();
     const { sequenceNumber } = state.output.execute;
@@ -218,17 +218,17 @@ const dispatchWhenSequenceNumber =
     }
   };
 
-export const wsExecuteStdin = (payload: string): SimpleThunkAction =>
+export const wsExecuteStdin = (payload: string): ThunkAction =>
   dispatchWhenSequenceNumber((sequenceNumber) =>
     slice.actions.wsExecuteStdin(payload, sequenceNumber),
   );
 
-export const wsExecuteStdinClose = (): SimpleThunkAction =>
+export const wsExecuteStdinClose = (): ThunkAction =>
   dispatchWhenSequenceNumber((sequenceNumber) =>
     slice.actions.wsExecuteStdinClose(undefined, sequenceNumber),
   );
 
-export const wsExecuteKill = (): SimpleThunkAction =>
+export const wsExecuteKill = (): ThunkAction =>
   dispatchWhenSequenceNumber((sequenceNumber) =>
     slice.actions.wsExecuteKill(undefined, sequenceNumber),
   );