Merge pull request #756 from integer32llc/survey

Add a notification for the Rust 2021 survey

Author: shepmaster

compiler/base/Cargo.toml

@@ -88,6 +88,10 @@ version = "=1.3.2"
 
 [dependencies.block_buffer]
 package = "block-buffer"
+version = "=0.10.0"
+
+[dependencies.block_buffer_0_9_0]
+package = "block-buffer"
 version = "=0.9.0"
 
 [dependencies.bstr]
@@ -160,6 +164,10 @@ version = "=0.3.2"
 package = "crossbeam-utils"
 version = "=0.8.5"
 
+[dependencies.crypto_common]
+package = "crypto-common"
+version = "=0.1.0"
+
 [dependencies.crypto_mac]
 package = "crypto-mac"
 version = "=0.11.1"
@@ -190,6 +198,10 @@ version = "=2.2.0"
 
 [dependencies.digest]
 package = "digest"
+version = "=0.10.0"
+
+[dependencies.digest_0_9_0]
+package = "digest"
 version = "=0.9.0"
 
 [dependencies.dtoa]
@@ -202,7 +214,7 @@ version = "=1.6.1"
 
 [dependencies.encoding_rs]
 package = "encoding_rs"
-version = "=0.8.29"
+version = "=0.8.30"
 
 [dependencies.env_logger]
 package = "env_logger"
@@ -315,7 +327,7 @@ version = "=0.3.0"
 
 [dependencies.h2]
 package = "h2"
-version = "=0.3.7"
+version = "=0.3.8"
 
 [dependencies.hashbrown]
 package = "hashbrown"
@@ -388,7 +400,7 @@ version = "=2.3.1"
 
 [dependencies.itertools]
 package = "itertools"
-version = "=0.10.1"
+version = "=0.10.3"
 
 [dependencies.itoa]
 package = "itoa"
@@ -404,15 +416,15 @@ version = "=1.4.0"
 
 [dependencies.libc]
 package = "libc"
-version = "=0.2.108"
+version = "=0.2.109"
 
 [dependencies.libm]
 package = "libm"
 version = "=0.2.1"
 
 [dependencies.libsqlite3_sys]
 package = "libsqlite3-sys"
-version = "=0.23.1"
+version = "=0.23.2"
 
 [dependencies.linked_hash_map]
 package = "linked-hash-map"
@@ -642,7 +654,7 @@ version = "=0.1.0"
 
 [dependencies.pkg_config]
 package = "pkg-config"
-version = "=0.3.22"
+version = "=0.3.23"
 
 [dependencies.png]
 package = "png"
@@ -670,7 +682,7 @@ version = "=0.1.1"
 
 [dependencies.proc_macro2]
 package = "proc-macro2"
-version = "=1.0.32"
+version = "=1.0.33"
 features = ["span-locations"]
 
 [dependencies.proc_macro_hack]
@@ -762,7 +774,7 @@ version = "=0.16.20"
 
 [dependencies.rusqlite]
 package = "rusqlite"
-version = "=0.26.1"
+version = "=0.26.3"
 features = ["bundled-full"]
 
 [dependencies.rustc_demangle]
@@ -807,12 +819,12 @@ version = "=0.10.2"
 
 [dependencies.serde]
 package = "serde"
-version = "=1.0.130"
+version = "=1.0.131"
 features = ["derive", "rc"]
 
 [dependencies.serde_derive]
 package = "serde_derive"
-version = "=1.0.130"
+version = "=1.0.131"
 
 [dependencies.serde_json]
 package = "serde_json"

compiler/base/crate-information.json

@@ -96,9 +96,14 @@
   },
   {
     "name": "block-buffer",
-    "version": "0.9.0",
+    "version": "0.10.0",
     "id": "block_buffer"
   },
+  {
+    "name": "block-buffer",
+    "version": "0.9.0",
+    "id": "block_buffer_0_9_0"
+  },
   {
     "name": "bstr",
     "version": "0.2.17",
@@ -184,6 +189,11 @@
     "version": "0.8.5",
     "id": "crossbeam_utils"
   },
+  {
+    "name": "crypto-common",
+    "version": "0.1.0",
+    "id": "crypto_common"
+  },
   {
     "name": "crypto-mac",
     "version": "0.11.1",
@@ -216,9 +226,14 @@
   },
   {
     "name": "digest",
-    "version": "0.9.0",
+    "version": "0.10.0",
     "id": "digest"
   },
+  {
+    "name": "digest",
+    "version": "0.9.0",
+    "id": "digest_0_9_0"
+  },
   {
     "name": "dtoa",
     "version": "0.4.8",
@@ -231,7 +246,7 @@
   },
   {
     "name": "encoding_rs",
-    "version": "0.8.29",
+    "version": "0.8.30",
     "id": "encoding_rs"
   },
   {
@@ -371,7 +386,7 @@
   },
   {
     "name": "h2",
-    "version": "0.3.7",
+    "version": "0.3.8",
     "id": "h2"
   },
   {
@@ -461,7 +476,7 @@
   },
   {
     "name": "itertools",
-    "version": "0.10.1",
+    "version": "0.10.3",
     "id": "itertools"
   },
   {
@@ -481,7 +496,7 @@
   },
   {
     "name": "libc",
-    "version": "0.2.108",
+    "version": "0.2.109",
     "id": "libc"
   },
   {
@@ -491,7 +506,7 @@
   },
   {
     "name": "libsqlite3-sys",
-    "version": "0.23.1",
+    "version": "0.23.2",
     "id": "libsqlite3_sys"
   },
   {
@@ -781,7 +796,7 @@
   },
   {
     "name": "pkg-config",
-    "version": "0.3.22",
+    "version": "0.3.23",
     "id": "pkg_config"
   },
   {
@@ -821,7 +836,7 @@
   },
   {
     "name": "proc-macro2",
-    "version": "1.0.32",
+    "version": "1.0.33",
     "id": "proc_macro2"
   },
   {
@@ -926,7 +941,7 @@
   },
   {
     "name": "rusqlite",
-    "version": "0.26.1",
+    "version": "0.26.3",
     "id": "rusqlite"
   },
   {
@@ -981,7 +996,7 @@
   },
   {
     "name": "serde",
-    "version": "1.0.130",
+    "version": "1.0.131",
     "id": "serde"
   },
   {
@@ -991,7 +1006,7 @@
   },
   {
     "name": "serde_derive",
-    "version": "1.0.130",
+    "version": "1.0.131",
     "id": "serde_derive"
   },
   {

compiler/base/modify-cargo-toml/Cargo.lock

@@ -10,12 +10,14 @@ import * as selectors from './selectors';
 import styles from './Notifications.module.css';
 
 const EDITION_URL = 'https://doc.rust-lang.org/edition-guide/';
+const SURVEY_URL = 'https://blog.rust-lang.org/2021/12/08/survey-launch.html';
 
 const Notifications: React.SFC = () => {
   return (
     <Portal>
       <div className={styles.container}>
         <Rust2021IsDefaultNotification />
+        <RustSurvey2021Notification />
       </div>
     </Portal>
   );
@@ -36,6 +38,24 @@ const Rust2021IsDefaultNotification: React.SFC = () => {
   );
 };
 
+
+const RustSurvey2021Notification: React.SFC = () => {
+  const showRustSurvey2021 = useSelector(selectors.showRustSurvey2021Selector);
+
+  const dispatch = useDispatch();
+  const seenRustSurvey2021 = useCallback(() => dispatch(actions.seenRustSurvey2021()), [dispatch]);
+
+  return showRustSurvey2021 && (
+    <Notification onClose={seenRustSurvey2021}>
+      Please help us take a look at who the Rust community is
+      composed of, how the Rust project is doing, and how we can
+      improve the Rust programming experience by completing the <a
+        href={SURVEY_URL}>2021 State of Rust Survey</a>. Whether or
+      not you use Rust today, we want to know your opinions.
+    </Notification>
+  );
+};
+
 interface NotificationProps {
   onClose: () => void;
 }

ui/frontend/Notifications.tsx

@@ -702,6 +702,7 @@ const notificationSeen = (notification: Notification) =>
   createAction(ActionType.NotificationSeen, { notification });
 
 export const seenRust2021IsDefault = () => notificationSeen(Notification.Rust2021IsDefault);
+export const seenRustSurvey2021 = () => notificationSeen(Notification.RustSurvey2021);
 
 export const browserWidthChanged = (isSmall: boolean) =>
   createAction(ActionType.BrowserWidthChanged, { isSmall });

ui/frontend/actions.ts

@@ -6,13 +6,15 @@ interface State {
   seenRust2018IsDefault: boolean; // expired
   seenRustSurvey2020: boolean; // expired
   seenRust2021IsDefault: boolean;
+  seenRustSurvey2021: boolean;
 }
 
 const DEFAULT: State = {
   seenRustSurvey2018: true,
   seenRust2018IsDefault: true,
   seenRustSurvey2020: true,
   seenRust2021IsDefault: false,
+  seenRustSurvey2021: false,
 };
 
 export default function notifications(state = DEFAULT, action: Action): State {
@@ -22,6 +24,9 @@ export default function notifications(state = DEFAULT, action: Action): State {
         case Notification.Rust2021IsDefault: {
           return { ...state, seenRust2021IsDefault: true };
         }
+        case Notification.RustSurvey2021: {
+          return { ...state, seenRustSurvey2021: true };
+        }
       }
     }
     default:

ui/frontend/reducers/notifications.ts

@@ -249,16 +249,25 @@ export const codeUrlSelector = createSelector(
 const notificationsSelector = (state: State) => state.notifications;
 
 const NOW = new Date();
+
 const RUST_2021_DEFAULT_END = new Date('2022-01-01T00:00:00Z');
 const RUST_2021_DEFAULT_OPEN = NOW <= RUST_2021_DEFAULT_END;
 export const showRust2021IsDefaultSelector = createSelector(
   notificationsSelector,
   notifications => RUST_2021_DEFAULT_OPEN && !notifications.seenRust2021IsDefault,
 );
 
+const RUST_SURVEY_2021_END = new Date('2021-12-22T00:00:00Z');
+const RUST_SURVEY_2021_OPEN = NOW <= RUST_SURVEY_2021_END;
+export const showRustSurvey2021Selector = createSelector(
+  notificationsSelector,
+  notifications => RUST_SURVEY_2021_OPEN && !notifications.seenRustSurvey2021,
+);
+
 export const anyNotificationsToShowSelector = createSelector(
   showRust2021IsDefaultSelector,
-  allNotifications => allNotifications,
+  showRustSurvey2021Selector,
+  (...allNotifications) => allNotifications.some(n => n),
 );
 
 export const clippyRequestSelector = createSelector(

ui/frontend/selectors/index.ts

@@ -120,6 +120,7 @@ export enum Focus {
 
 export enum Notification {
   Rust2021IsDefault = 'rust-2021-is-default',
+  RustSurvey2021 = 'rust-survey-2021',
 }
 
 export type AceResizeKey = [Focus, number];