Merge pull request #880 from integer32llc/maint

shepmaster · web-flow · commit 60de15ea2669 · 2023-01-17T14:24:57.000-05:00
diff --git a/tests/Gemfile.lock b/tests/Gemfile.lock
@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    capybara (3.37.1)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    capybara (3.38.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -15,43 +15,41 @@ GEM
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
-    childprocess (4.1.0)
     diff-lcs (1.5.0)
-    launchy (2.5.0)
-      addressable (~> 2.7)
+    launchy (2.5.2)
+      addressable (~> 2.8)
     matrix (0.4.2)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    nokogiri (1.13.8)
+    mini_portile2 (2.8.1)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.4)
+    public_suffix (5.0.1)
+    racc (1.6.2)
+    rack (3.0.3)
     rack-test (2.0.2)
       rack (>= 1.3)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubyzip (2.3.2)
-    selenium-webdriver (4.4.0)
-      childprocess (>= 0.5, < 5.0)
+    selenium-webdriver (4.7.1)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    webdrivers (5.0.0)
+    webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0)
diff --git a/ui/frontend/AdvancedOptionsMenu.tsx b/ui/frontend/AdvancedOptionsMenu.tsx
@@ -16,8 +16,8 @@ const AdvancedOptionsMenu: React.FC = () => {
 
   const dispatch = useDispatch();
 
-  const changeEdition = useCallback((e) => dispatch(actions.changeEdition(e)), [dispatch]);
-  const changeBacktrace = useCallback((b) => dispatch(actions.changeBacktrace(b)), [dispatch]);
+  const changeEdition = useCallback((e: Edition) => dispatch(actions.changeEdition(e)), [dispatch]);
+  const changeBacktrace = useCallback((b: Backtrace) => dispatch(actions.changeBacktrace(b)), [dispatch]);
 
   return (
     <MenuGroup title="Advanced options">
diff --git a/ui/frontend/ButtonMenuItem.tsx b/ui/frontend/ButtonMenuItem.tsx
@@ -7,6 +7,7 @@ import styles from './ButtonMenuItem.module.css';
 type Button = JSX.IntrinsicElements['button'];
 
 interface ButtonMenuItemProps extends Button {
+  children: React.ReactNode;
   name: string;
 }
 
diff --git a/ui/frontend/ChannelMenu.tsx b/ui/frontend/ChannelMenu.tsx
@@ -24,7 +24,7 @@ const ChannelMenu: React.FC<ChannelMenuProps> = props => {
   const nightlyVersionDetails = useSelector(selectors.nightlyVersionDetailsText);
 
   const dispatch = useDispatch();
-  const changeChannel = useCallback((channel) => {
+  const changeChannel = useCallback((channel: Channel) => {
     dispatch(actions.changeChannel(channel));
     props.close();
   }, [dispatch, props]);
@@ -63,7 +63,7 @@ const ChannelMenu: React.FC<ChannelMenuProps> = props => {
   );
 };
 
-const Desc: React.FC<{}> = ({ children }) => (
+const Desc: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => (
   <p className={styles.description}>{children}</p>
 );
 
diff --git a/ui/frontend/ConfigElement.module.css b/ui/frontend/ConfigElement.module.css
@@ -42,9 +42,9 @@
     text-transform: uppercase;
 
     & ~ label {
+      border-radius: 0 var(--header-border-radius) var(--header-border-radius) 0;
       border-right-width: 1px;
       border-left: $border;
-      border-radius: 0 var(--header-border-radius) var(--header-border-radius) 0;
     }
 
     &:hover {
diff --git a/ui/frontend/ConfigElement.tsx b/ui/frontend/ConfigElement.tsx
@@ -4,52 +4,54 @@ import MenuItem from './MenuItem';
 
 import styles from './ConfigElement.module.css';
 
-interface EitherProps extends ConfigElementProps {
+interface EitherProps<T extends string> extends ConfigElementProps {
   id: string;
   a: string;
   b: string;
   aLabel?: string;
   bLabel?: string;
-  value: string;
-  onChange: (_: string) => any;
+  value: T;
+  onChange: (_: T) => any;
 }
 
-export const Either: React.FC<EitherProps> =
-  ({ id, a, b, aLabel = a, bLabel = b, value, onChange, ...rest }) => (
+export const Either =
+  <T extends string,>({ id, a, b, aLabel = a, bLabel = b, value, onChange, ...rest }: EitherProps<T>) => (
     <ConfigElement {...rest}>
       <div className={styles.toggle}>
         <input id={`${id}-a`}
           name={id}
           value={a}
           type="radio"
           checked={value === a}
-          onChange={() => onChange(a)} />
+          onChange={() => onChange(a as T)} />
         <label htmlFor={`${id}-a`}>{aLabel}</label>
         <input id={`${id}-b`}
           name={id}
           value={b}
           type="radio"
           checked={value === b}
-          onChange={() => onChange(b)} />
+          onChange={() => onChange(b as T)} />
         <label htmlFor={`${id}-b`}>{bLabel}</label>
       </div>
     </ConfigElement>
   );
 
-interface SelectProps extends ConfigElementProps {
-  value: string;
-  onChange: (_: string) => any;
+interface SelectProps<T extends string> extends ConfigElementProps {
+  children: React.ReactNode;
+  value: T;
+  onChange: (_: T) => any;
 }
 
-export const Select: React.FC<SelectProps> = ({ value, onChange, children, ...rest }) => (
+export const Select = <T extends string,>({ value, onChange, children, ...rest }: SelectProps<T>) => (
   <ConfigElement {...rest}>
-    <select className={styles.select} value={value} onChange={e => onChange(e.target.value)}>
+    <select className={styles.select} value={value} onChange={e => onChange(e.target.value as T)}>
       {children}
     </select>
   </ConfigElement>
 );
 
 interface ConfigElementProps {
+  children?: React.ReactNode;
   name: string;
   isNotDefault?: boolean;
   aside?: JSX.Element,
diff --git a/ui/frontend/ConfigMenu.tsx b/ui/frontend/ConfigMenu.tsx
@@ -17,15 +17,11 @@ import {
   ProcessAssembly,
 } from './types';
 
-interface ConfigMenuProps {
-  close: () => void;
-}
-
 const MONACO_THEMES = [
   'vs', 'vs-dark', 'vscode-dark-plus',
 ];
 
-const ConfigMenu: React.FC<ConfigMenuProps> = () => {
+const ConfigMenu: React.FC = () => {
   const keybinding = useSelector((state: State) => state.configuration.ace.keybinding);
   const aceTheme = useSelector((state: State) => state.configuration.ace.theme);
   const monacoTheme = useSelector((state: State) => state.configuration.monaco.theme);
@@ -37,15 +33,19 @@ const ConfigMenu: React.FC<ConfigMenuProps> = () => {
   const processAssembly = useSelector((state: State) => state.configuration.processAssembly);
 
   const dispatch = useDispatch();
-  const changeAceTheme = useCallback((t) => dispatch(actions.changeAceTheme(t)), [dispatch]);
-  const changeMonacoTheme = useCallback((t) => dispatch(actions.changeMonacoTheme(t)), [dispatch]);
-  const changeKeybinding = useCallback((k) => dispatch(actions.changeKeybinding(k)), [dispatch]);
-  const changeOrientation = useCallback((o) => dispatch(actions.changeOrientation(o)), [dispatch]);
-  const changeEditorStyle = useCallback((e) => dispatch(actions.changeEditor(e)), [dispatch]);
-  const changeAssemblyFlavor = useCallback((a) => dispatch(actions.changeAssemblyFlavor(a)), [dispatch]);
-  const changePairCharacters = useCallback((p) => dispatch(actions.changePairCharacters(p)), [dispatch]);
-  const changeProcessAssembly = useCallback((p) => dispatch(actions.changeProcessAssembly(p)), [dispatch]);
-  const changeDemangleAssembly = useCallback((d) => dispatch(actions.changeDemangleAssembly(d)), [dispatch]);
+  const changeAceTheme = useCallback((t: string) => dispatch(actions.changeAceTheme(t)), [dispatch]);
+  const changeMonacoTheme = useCallback((t: string) => dispatch(actions.changeMonacoTheme(t)), [dispatch]);
+  const changeKeybinding = useCallback((k: string) => dispatch(actions.changeKeybinding(k)), [dispatch]);
+  const changeOrientation = useCallback((o: Orientation) => dispatch(actions.changeOrientation(o)), [dispatch]);
+  const changeEditorStyle = useCallback((e: Editor) => dispatch(actions.changeEditor(e)), [dispatch]);
+  const changeAssemblyFlavor =
+    useCallback((a: AssemblyFlavor) => dispatch(actions.changeAssemblyFlavor(a)), [dispatch]);
+  const changePairCharacters =
+    useCallback((p: PairCharacters) => dispatch(actions.changePairCharacters(p)), [dispatch]);
+  const changeProcessAssembly =
+    useCallback((p: ProcessAssembly) => dispatch(actions.changeProcessAssembly(p)), [dispatch]);
+  const changeDemangleAssembly =
+    useCallback((d: DemangleAssembly) => dispatch(actions.changeDemangleAssembly(d)), [dispatch]);
 
   return (
     <Fragment>
diff --git a/ui/frontend/Header.tsx b/ui/frontend/Header.tsx
@@ -57,6 +57,7 @@ const Header: React.FC = () => (
 );
 
 interface HeaderSetProps {
+  children: React.ReactNode;
   id: string;
 }
 
diff --git a/ui/frontend/HeaderButton.tsx b/ui/frontend/HeaderButton.tsx
@@ -5,6 +5,7 @@ import { ExpandableIcon } from './Icon';
 import styles from './HeaderButton.module.css';
 
 interface HeaderButtonProps {
+  children?: React.ReactNode;
   bold?: boolean;
   icon?: React.ReactNode;
   rightIcon?: React.ReactNode;
diff --git a/ui/frontend/Help.tsx b/ui/frontend/Help.tsx
@@ -330,12 +330,13 @@ const LinkableSection: React.FC<LinkableSectionProps> = ({
 );
 
 interface LinkableSectionProps {
+  children: React.ReactNode;
   id: string;
   header: string;
   level: React.ElementType;
 }
 
-const Code: React.FC = ({ children }) => (
+const Code: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => (
   <code className={styles.code}>{children}</code>
 );
 
diff --git a/ui/frontend/MenuAside.tsx b/ui/frontend/MenuAside.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import styles from './MenuAside.module.css';
 
-const MenuAside: React.FC = ({ children }) => (
+const MenuAside: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => (
   <p className={styles.aside}>
     {children}
   </p>
diff --git a/ui/frontend/MenuGroup.tsx b/ui/frontend/MenuGroup.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import styles from './MenuGroup.module.css';
 
 interface MenuGroupProps {
+  children: React.ReactNode;
   title: string;
 }
 
diff --git a/ui/frontend/MenuItem.tsx b/ui/frontend/MenuItem.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import styles from './MenuItem.module.css';
 
-const MenuItem: React.FC<{}> = ({ children }) => (
+const MenuItem: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => (
   <div className={styles.container}>{children}</div>
 );
 
diff --git a/ui/frontend/ModeMenu.tsx b/ui/frontend/ModeMenu.tsx
@@ -15,7 +15,7 @@ interface ModeMenuProps {
 const ModeMenu: React.FC<ModeMenuProps> = props => {
   const mode = useSelector((state: State) => state.configuration.mode);
   const dispatch = useDispatch();
-  const changeMode = useCallback((mode) => {
+  const changeMode = useCallback((mode: Mode) => {
     dispatch(actions.changeMode(mode));
     props.close();
   }, [dispatch, props]
diff --git a/ui/frontend/Notifications.tsx b/ui/frontend/Notifications.tsx
@@ -21,7 +21,7 @@ const Notifications: React.FC = () => {
   );
 };
 
-const RustSurvey2022Notification: React.SFC = () => {
+const RustSurvey2022Notification: React.FC = () => {
   const showRustSurvey2022 = useSelector(selectors.showRustSurvey2022Selector);
 
   const dispatch = useDispatch();
@@ -39,6 +39,7 @@ const RustSurvey2022Notification: React.SFC = () => {
 };
 
 interface NotificationProps {
+  children: React.ReactNode;
   onClose: () => void;
 }
 
diff --git a/ui/frontend/Output/Gist.tsx b/ui/frontend/Output/Gist.tsx
@@ -21,6 +21,7 @@ const Gist: React.FC = () => {
 };
 
 interface CopiedProps {
+  children: React.ReactNode;
   href: string;
 }
 
@@ -69,6 +70,7 @@ const Links: React.FC = () => {
 };
 
 interface NewWindowProps {
+  children: React.ReactNode;
   href: string;
 }
 
diff --git a/ui/frontend/Output/OutputPrism.tsx b/ui/frontend/Output/OutputPrism.tsx
@@ -4,6 +4,7 @@ import { PrismCode } from 'react-prism';
 import styles from './OutputPrism.module.css';
 
 interface OutputPrismProps {
+  children: React.ReactNode;
   languageCode: 'language-rust_mir' | 'language-rust_errors';
 }
 
diff --git a/ui/frontend/Output/Section.tsx b/ui/frontend/Output/Section.tsx
@@ -5,6 +5,7 @@ import Header from './Header';
 import styles from './Section.module.css';
 
 interface SectionProps {
+  children: React.ReactNode;
   kind: string;
   label: string;
 }
diff --git a/ui/frontend/Output/SimplePane.tsx b/ui/frontend/Output/SimplePane.tsx
@@ -6,6 +6,7 @@ import Section from './Section';
 import OutputPrism from './OutputPrism';
 
 interface HighlightErrorsProps {
+  children: React.ReactNode;
   label: string;
 }
 
@@ -19,6 +20,7 @@ const HighlightErrors: React.FC<HighlightErrorsProps> = ({ label, children }) =>
 );
 
 export interface SimplePaneProps extends ReallySimplePaneProps {
+  children?: React.ReactNode;
   kind: string;
 }
 
diff --git a/ui/frontend/PopButton.module.css b/ui/frontend/PopButton.module.css
@@ -29,12 +29,12 @@ $vertical-border-color: #cacaca;
 }
 
 .content {
+  border-radius: var(--header-border-radius);
   border-right: 1px solid $vertical-border-color;
   border-bottom: 1px solid var(--header-accent-border);
   border-left: 1px solid $vertical-border-color;
   margin: $arrow-size;
   background: $bg-color;
-  border-radius: var(--header-border-radius);
   box-shadow: 0 1px 4px -2px rgb(0 0 0 / 60%), inset 0 1px 0 white;
   color: $fg-color;
 }
diff --git a/ui/frontend/Router.tsx b/ui/frontend/Router.tsx
@@ -91,6 +91,7 @@ export default class Router extends React.Component<RouterProps> {
 }
 
 interface RouterProps {
+  children: React.ReactNode;
   store: any;
   reducer: any;
 }
diff --git a/ui/frontend/SegmentedButton.tsx b/ui/frontend/SegmentedButton.tsx
diff --git a/ui/frontend/SelectOne.tsx b/ui/frontend/SelectOne.tsx
diff --git a/ui/frontend/editor/AceEditor.tsx b/ui/frontend/editor/AceEditor.tsx
diff --git a/ui/frontend/editor/Editor.tsx b/ui/frontend/editor/Editor.tsx
diff --git a/ui/frontend/index.tsx b/ui/frontend/index.tsx
diff --git a/ui/frontend/package.json b/ui/frontend/package.json
diff --git a/ui/frontend/uss-router/Link.tsx b/ui/frontend/uss-router/Link.tsx
diff --git a/ui/frontend/uss-router/Router.tsx b/ui/frontend/uss-router/Router.tsx
diff --git a/ui/frontend/uss-router/index.ts b/ui/frontend/uss-router/index.ts
diff --git a/ui/frontend/yarn.lock b/ui/frontend/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import styles from './ButtonMenuItem.module.css';`
`7`	`7`	`type Button = JSX.IntrinsicElements['button'];`
`8`	`8`
`9`	`9`	`interface ButtonMenuItemProps extends Button {`
	`10`	`+ children: React.ReactNode;`
`10`	`11`	`name: string;`
`11`	`12`	`}`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@`
`42`	`42`	`text-transform: uppercase;`
`43`	`43`
`44`	`44`	`& ~ label {`
	`45`	`+ border-radius: 0 var(--header-border-radius) var(--header-border-radius) 0;`
`45`	`46`	`border-right-width: 1px;`
`46`	`47`	`border-left: $border;`
`47`		`- border-radius: 0 var(--header-border-radius) var(--header-border-radius) 0;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`&:hover {`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ const Header: React.FC = () => (`
`57`	`57`	`);`
`58`	`58`
`59`	`59`	`interface HeaderSetProps {`
	`60`	`+ children: React.ReactNode;`
`60`	`61`	`id: string;`
`61`	`62`	`}`
`62`	`63`