Bump rustc to nightly-2021-10-21

.github/workflows/gui-ci.yml

@@ -114,7 +114,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2021-06-17
+          toolchain: nightly-2021-10-22
           override: true
       - name: Install Prettier
         run: npm install --save-dev --save-exact prettier
@@ -148,7 +148,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2021-06-17
+          toolchain: nightly-2021-10-22
           override: true
       - name: Run tests (no WASM)
         run: node ./run test --no-wasm --skip-version-validation
@@ -174,7 +174,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2021-06-17
+          toolchain: nightly-2021-10-22
           override: true
       - name: Install wasm-pack (macOS)
         env:
@@ -233,7 +233,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2021-06-17
+          toolchain: nightly-2021-10-22
           override: true
       - name: Install wasm-pack (macOS)
         env:
@@ -312,7 +312,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2021-06-17
+          toolchain: nightly-2021-10-22
           override: true
       - name: Install wasm-pack (macOS)
         env:

run

@@ -19,7 +19,7 @@ async function init () {
         console.log("Checking versions of installed packages.")
         await cmd.check_version('node',node_lts_version)
         await cmd.check_version('npm',npm_lts_version)
-        await cmd.check_version('rustc','1.55.0-nightly',{
+        await cmd.check_version('rustc','1.58.0-nightly',{
             preprocess:(v)=>v.substring(6,20)
         })
     }

rust-toolchain

@@ -1 +1 @@
-nightly-2021-06-17
+nightly-2021-10-22

src/rust/ensogl/example/src/lib.rs

@@ -9,7 +9,7 @@
 #![feature(fn_traits)]
 #![feature(specialization)]
 #![feature(trait_alias)]
-#![feature(min_type_alias_impl_trait)]
+#![feature(type_alias_impl_trait)]
 #![feature(unboxed_closures)]
 #![allow(incomplete_features)] // To be removed, see: https://github.com/enso-org/ide/issues/1559
 #![warn(missing_copy_implementations)]

src/rust/ensogl/example/src/list_view.rs

@@ -40,7 +40,9 @@ pub fn entry_point_list_view() {
 
 #[derive(Clone,Debug)]
 struct MockEntries {
+    #[allow(dead_code)]
     logger        : Logger,
+    #[allow(dead_code)]
     scene         : Scene,
     entries_count : usize,
 }

src/rust/ensogl/lib/components/src/drop_down_menu.rs

@@ -101,7 +101,9 @@ pub type Entry = list_view::entry::Label;
 
 #[derive(Clone,Debug)]
 struct Model {
+    #[allow(dead_code)]
     logger          : Logger,
+    #[allow(dead_code)]
     app             : Application,
     display_object  : display::object::Instance,
 

src/rust/ensogl/lib/components/src/label.rs

@@ -69,6 +69,7 @@ struct Model {
     background     : background::View,
     label          : text::Area,
     display_object : display::object::Instance,
+    #[allow(dead_code)]
     app            : Application,
     style          : StyleWatch,
 }

src/rust/ensogl/lib/core/src/display/shape/primitive/shader/canvas.rs

@@ -140,9 +140,7 @@ impl Canvas {
 
     /// Get the final GLSL code.
     pub fn to_glsl(&self) -> String {
-        if !self.current_function_lines.is_empty() {
-            panic!("Internal error. Not all canvas GLSL code lines were converted to functions.");
-        }
+        assert!(self.current_function_lines.is_empty(), "Internal error. Not all canvas GLSL code lines were converted to functions.");
         self.functions.join("\n\n")
     }
 }

src/rust/ensogl/lib/core/src/lib.rs

@@ -15,7 +15,7 @@
 #![feature(specialization)]
 #![feature(trait_alias)]
 #![feature(marker_trait_attr)]
-#![feature(min_type_alias_impl_trait)]
+#![feature(type_alias_impl_trait)]
 #![feature(unboxed_closures)]
 #![allow(incomplete_features)] // To be removed, see: https://github.com/enso-org/ide/issues/1559
 #![warn(missing_copy_implementations)]

src/rust/ensogl/lib/text/src/buffer/view.rs

@@ -47,6 +47,7 @@ pub struct History {
 #[derive(Debug,Clone,Default)]
 pub struct HistoryData {
     undo_stack : Vec<(Text,Style,selection::Group)>,
+    #[allow(dead_code)]
     redo_stack : Vec<(Text,Style,selection::Group)>,
 }
 

src/rust/ensogl/lib/text/src/buffer/view/movement.rs

@@ -112,7 +112,7 @@ impl ViewBuffer {
     pub fn moved_selection_region
     (&self, transform:Transform, selection:Selection, modify:bool) -> Selection {
         let text  = &self.text();
-        let shape = |start,end| selection::Shape(start,end);
+        let shape = selection::Shape;
         let shape : selection::Shape = match transform {
             Transform::All => {
                 shape(default(),self.offset_to_location(text.byte_size()))

src/rust/ide/lib/ast/impl/src/lib.rs

@@ -2,7 +2,7 @@
 #![feature(bool_to_option)]
 #![feature(generators, generator_trait)]
 #![feature(trivial_bounds)]
-#![feature(min_type_alias_impl_trait)]
+#![feature(type_alias_impl_trait)]
 
 #[warn(missing_docs)]
 pub mod assoc;

src/rust/ide/lib/ast/impl/src/prefix.rs

@@ -95,9 +95,9 @@ impl Chain {
     /// App(App(a,b),c) into flat list where first element is the function and
     /// then arguments are placed: `{func:a, args:[b,c]}`.
     pub fn from_prefix(ast:&known::Prefix) -> Chain {
-        fn run(ast:&known::Prefix, mut acc: &mut Vec<Argument>) -> Ast {
+        fn run(ast:&known::Prefix, acc: &mut Vec<Argument>) -> Ast {
             let func = match known::Prefix::try_from(&ast.func) {
-                Ok(lhs_app) => run(&lhs_app, &mut acc),
+                Ok(lhs_app) => run(&lhs_app, acc),
                 _           => ast.func.clone(),
             };
             let sast      = Shifted{wrapped:ast.arg.clone(),off:ast.off};

src/rust/ide/lib/enso-protocol/src/lib.rs

@@ -6,7 +6,7 @@
 #![feature(associated_type_defaults)]
 #![feature(coerce_unsized)]
 #![feature(trait_alias)]
-#![feature(min_type_alias_impl_trait)]
+#![feature(type_alias_impl_trait)]
 #![warn(missing_docs)]
 #![warn(trivial_casts)]
 #![warn(trivial_numeric_casts)]

src/rust/ide/src/double_representation/refactorings/collapse.rs

@@ -182,6 +182,7 @@ pub struct Extracted {
     /// Nodes that are being collapsed and extracted into a separate method.
     extracted_nodes : Vec<NodeInfo>,
     /// Helper for efficient lookup.
+    #[allow(dead_code)]
     extracted_nodes_set : HashSet<node::Id>,
 }
 

src/rust/ide/src/ide.rs

@@ -40,6 +40,7 @@ const ALIVE_LOG_INTERVAL_SEC:u64 = 60;
 #[derive(Debug)]
 pub struct Ide {
     application : Application,
+    #[allow(dead_code)]
     integration : Integration,
     network     : frp::Network,
 }

src/rust/ide/src/lib.rs

@@ -77,6 +77,7 @@ pub mod prelude {
     pub use futures::task::LocalSpawnExt;
 
     pub use std::ops::Range;
+    pub use std::assert_matches::assert_matches;
 
     pub use utils::fail::FallibleResult;
     pub use utils::vec::VecExt;

src/rust/ide/view/graph-editor/src/component/visualization/container.rs

@@ -155,6 +155,7 @@ ensogl::define_endpoints! {
 #[derive(Debug)]
 #[allow(missing_docs)]
 pub struct View {
+    #[allow(dead_code)]
     logger         : Logger,
     display_object : display::object::Instance,
 

src/rust/ide/view/graph-editor/src/lib.rs

@@ -11,7 +11,7 @@
 #![feature(option_result_contains)]
 #![feature(specialization)]
 #![feature(trait_alias)]
-#![feature(min_type_alias_impl_trait)]
+#![feature(type_alias_impl_trait)]
 #![feature(unboxed_closures)]
 #![allow(incomplete_features)] // To be removed, see: https://github.com/enso-org/ide/issues/1559
 #![warn(missing_copy_implementations)]

src/rust/ide/view/src/lib.rs

@@ -11,7 +11,7 @@
 #![feature(option_result_contains)]
 #![feature(specialization)]
 #![feature(trait_alias)]
-#![feature(min_type_alias_impl_trait)]
+#![feature(type_alias_impl_trait)]
 #![feature(unboxed_closures)]
 #![allow(incomplete_features)] // To be removed, see: https://github.com/enso-org/ide/issues/1559
 #![warn(missing_copy_implementations)]

src/rust/lib/frp/src/data/watch.rs

@@ -80,6 +80,7 @@ pub struct Ref<T> {
     /// The underlying type.
     #[shrinkwrap(main_field)]
     pub target : T,
+    #[allow(dead_code)]
     handle : Handle
 }
 

src/rust/lib/frp/src/debug.rs

@@ -34,9 +34,12 @@ impl VizNode {
 /// Visualization data for a link between nodes.
 #[derive(Debug,Clone)]
 pub struct VizLink {
+    #[allow(dead_code)]
     source_display_id : usize,
+    #[allow(dead_code)]
     target_display_id : usize,
 //    message_type      : DataType,
+    #[allow(dead_code)]
     data_type         : String,
 }
 
@@ -55,6 +58,7 @@ impl VizLink {
 pub struct Graphviz {
     nodes  : HashMap<usize,VizNode>,
     labels : HashMap<usize,String>,
+    #[allow(dead_code)]
     links  : Vec<VizLink>,
 }
 

src/rust/lib/frp/src/io/keyboard.rs

@@ -385,8 +385,11 @@ impl Default for Keyboard {
 /// A handle of listener emitting events on bound FRP graph.
 #[derive(Debug)]
 pub struct DomBindings {
+    #[allow(dead_code)]
     key_down : Listener<dyn KeyboardEventCallback>,
+    #[allow(dead_code)]
     key_up   : Listener<dyn KeyboardEventCallback>,
+    #[allow(dead_code)]
     blur     : Listener<dyn EventCallback>,
 }