Automatically select nightly channel when selecting Rust 2021

Author: shepmaster

ui/frontend/AdvancedOptionsMenu.tsx

@@ -4,13 +4,15 @@ import { useSelector, useDispatch } from 'react-redux';
 import * as actions from './actions';
 import { Either as EitherConfig, Select as SelectConfig } from './ConfigElement';
 import MenuGroup from './MenuGroup';
+import MenuAside from './MenuAside';
 import { State } from './reducers';
 import * as selectors from './selectors';
 import { Backtrace, Edition } from './types';
 
 const AdvancedOptionsMenu: React.SFC = () => {
   const isEditionDefault = useSelector(selectors.isEditionDefault);
   const edition = useSelector((state: State) => state.configuration.edition);
+  const isRust2021Available = useSelector(selectors.isRust2021Available);
   const isBacktraceSet = useSelector(selectors.getBacktraceSet);
   const backtrace = useSelector((state: State) => state.configuration.backtrace);
 
@@ -19,13 +21,16 @@ const AdvancedOptionsMenu: React.SFC = () => {
   const changeEdition = useCallback((e) => dispatch(actions.changeEdition(e)), [dispatch]);
   const changeBacktrace = useCallback((b) => dispatch(actions.changeBacktrace(b)), [dispatch]);
 
+  const Aside = !isRust2021Available && <Rust2021Aside />;
+
   return (
     <MenuGroup title="Advanced options">
       <SelectConfig
         name="Edition"
         value={edition}
         isNotDefault={!isEditionDefault}
         onChange={changeEdition}
+        aside={Aside}
       >
         <option value={Edition.Rust2015}>2015</option>
         <option value={Edition.Rust2018}>2018</option>
@@ -44,4 +49,11 @@ const AdvancedOptionsMenu: React.SFC = () => {
   );
 };
 
+const Rust2021Aside: React.SFC = () => (
+  <MenuAside>
+    Note: Rust 2021 currently requires using the Nightly channel, selecting this
+    option will switch to Nightly.
+  </MenuAside>
+);
+
 export default AdvancedOptionsMenu;

ui/frontend/ConfigElement.tsx

@@ -52,15 +52,17 @@ export const Select: React.SFC<SelectProps> = ({ value, onChange, children, ...r
 interface ConfigElementProps {
   name: string;
   isNotDefault?: boolean;
+  aside?: JSX.Element,
 }
 
-const ConfigElement: React.SFC<ConfigElementProps> = ({ name, isNotDefault, children }) => (
+const ConfigElement: React.SFC<ConfigElementProps> = ({ name, isNotDefault, aside, children }) => (
   <MenuItem>
     <div className={styles.container}>
       <span className={isNotDefault ? styles.notDefault : styles.name}>{name}</span>
       <div className={styles.value}>
         {children}
       </div>
     </div>
+    {aside}
   </MenuItem>
 );

ui/frontend/actions.ts

@@ -165,9 +165,16 @@ export const changeChannel = (channel: Channel) =>
 export const changeMode = (mode: Mode) =>
   createAction(ActionType.ChangeMode, { mode });
 
-export const changeEdition = (edition: Edition) =>
+const changeEditionRaw = (edition: Edition) =>
   createAction(ActionType.ChangeEdition, { edition });
 
+export const changeEdition = (edition: Edition): ThunkAction => dispatch => {
+  if (edition == Edition.Rust2021) {
+    dispatch(changeChannel(Channel.Nightly));
+  }
+  dispatch(changeEditionRaw(edition));
+}
+
 export const changeBacktrace = (backtrace: Backtrace) =>
   createAction(ActionType.ChangeBacktrace, { backtrace });
 
@@ -805,7 +812,7 @@ export type Action =
   | ReturnType<typeof changeBacktrace>
   | ReturnType<typeof changeChannel>
   | ReturnType<typeof changeDemangleAssembly>
-  | ReturnType<typeof changeEdition>
+  | ReturnType<typeof changeEditionRaw>
   | ReturnType<typeof changeEditor>
   | ReturnType<typeof changeFocus>
   | ReturnType<typeof changeKeybinding>

ui/frontend/selectors/index.ts

@@ -108,6 +108,7 @@ export const isNightlyChannel = (state: State) => (
 );
 export const isWasmAvailable = isNightlyChannel;
 export const isHirAvailable = isNightlyChannel;
+export const isRust2021Available = isNightlyChannel;
 
 export const getModeLabel = (state: State) => {
   const { configuration: { mode } } = state;