remove edition 2021 aside

since it's now available everywhere

Author: lqd

ui/frontend/AdvancedOptionsMenu.tsx

@@ -4,15 +4,13 @@ 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);
 
@@ -21,16 +19,13 @@ 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>
@@ -49,11 +44,4 @@ 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/selectors/index.ts

@@ -108,7 +108,6 @@ 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;