Merge #2334

2334: update rust january 7 2021 r=bradjc a=hudson-ayers ### Pull Request Overview This pull request updates the rust nightly version to 2021-01-07. This was motivated by the stabilization of `min_const_generics` ( rust-lang/rust#79135 ) -- by using this nightly, we will be able to use const generics in Tock without adding an unstable feature. ### Testing Strategy compiling ### TODO or Help Wanted N/A ### Documentation Updated - [x] Updated the relevant files in `/docs`. ### Formatting - [x] Ran `make prepush`. Co-authored-by: Hudson Ayers <hayers@stanford.edu>
tock · Jan 11, 2021 · 75cb55f · 75cb55f
2 parents 24b1138 + dd173d9
commit 75cb55f
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 13 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
     "editor.formatOnSave": true,
-    "rust-client.channel": "nightly-2020-10-25",
+    "rust-client.channel": "nightly-2021-01-07",
 }
diff --git a/capsules/src/st77xx.rs b/capsules/src/st77xx.rs
@@ -1,6 +1,6 @@
 //! ST77xx Screen
 //!
-//! - https://learn.adafruit.com/adafruit-1-3-and-1-54-240-x-240-wide-angle-tft-lcd-displays
+//! - <https://learn.adafruit.com/adafruit-1-3-and-1-54-240-x-240-wide-angle-tft-lcd-displays>
 //!
 //! The screen supports multiple physical busses, and this driver is implemented
 //! on top of the generic `Bus` interface.

diff --git a/capsules/src/usb/ctap.rs b/capsules/src/usb/ctap.rs
@@ -1,6 +1,6 @@
 //! Client to Authenticator Protocol CTAPv2 over USB HID
 //!
-//! Based on the spec avaliable at: https://fidoalliance.org/specs/fido-v2.0-id-20180227/fido-client-to-authenticator-protocol-v2.0-id-20180227.html
+//! Based on the spec avaliable at: <https://fidoalliance.org/specs/fido-v2.0-id-20180227/fido-client-to-authenticator-protocol-v2.0-id-20180227.html>
 
 use core::cell::Cell;
 use core::cmp;

diff --git a/chips/earlgrey/src/aes.rs b/chips/earlgrey/src/aes.rs
@@ -1,6 +1,6 @@
 //! Support for the AES hardware block on OpenTitan
 //!
-//! https://docs.opentitan.org/hw/ip/aes/doc/
+//! <https://docs.opentitan.org/hw/ip/aes/doc/>
 
 use kernel::common::cells::{OptionalCell, TakeCell};
 use kernel::common::registers::{

diff --git a/chips/imxrt10xx/src/lib.rs b/chips/imxrt10xx/src/lib.rs
@@ -5,7 +5,6 @@
 #![crate_name = "imxrt10xx"]
 #![crate_type = "rlib"]
 #![feature(const_fn)]
-#![feature(min_const_generics)] // Stabilized in Rust 1.51 (https://github.com/rust-lang/rust/pull/79135)
 #![no_std]
 
 pub mod chip;

diff --git a/doc/Getting_Started.md b/doc/Getting_Started.md
@@ -75,7 +75,7 @@ of installing some of these tools, but you can also install them yourself.
 
 #### Rust (nightly)
 
-We are using `nightly-2020-10-25`. We require
+We are using `nightly-2021-01-07`. We require
 installing it with [rustup](http://www.rustup.rs) so you can manage multiple
 versions of Rust and continue using stable versions for other Rust code:
 
@@ -90,7 +90,7 @@ to your `$PATH`.
 Then install the correct nightly version of Rust:
 
 ```bash
-$ rustup install nightly-2020-10-25
+$ rustup install nightly-2021-01-07
 ```
 
 #### Tockloader

diff --git a/kernel/src/debug.rs b/kernel/src/debug.rs
@@ -70,7 +70,7 @@ use crate::ReturnCode;
 /// Also, in our use cases, writes are infaillible, so the write function just doesn't return
 /// anything.
 ///
-/// See also the tracking issue: https://github.com/rust-lang/rfcs/issues/2262
+/// See also the tracking issue: <https://github.com/rust-lang/rfcs/issues/2262>
 pub trait IoWrite {
     fn write(&mut self, buf: &[u8]);
 

diff --git a/kernel/src/platform/mpu.rs b/kernel/src/platform/mpu.rs
@@ -53,7 +53,7 @@ impl Region {
 /// Null type for the default type of the `MpuConfig` type in an implementation
 /// of the `MPU` trait. We need this to workaround a bug in the Rust compiler.
 ///
-/// Depending how https://github.com/rust-lang/rust/issues/65774 is resolved we
+/// Depending how <https://github.com/rust-lang/rust/issues/65774> is resolved we
 /// may be able to remove this type, but only if a default `Display` is
 /// provided for the `()` type.
 #[derive(Default)]

diff --git a/kernel/src/sched/round_robin.rs b/kernel/src/sched/round_robin.rs
@@ -2,7 +2,7 @@
 //!
 //! This scheduler is specifically a Round Robin Scheduler with Interrupts.
 //!
-//! See: https://www.eecs.umich.edu/courses/eecs461/lecture/SWArchitecture.pdf
+//! See: <https://www.eecs.umich.edu/courses/eecs461/lecture/SWArchitecture.pdf>
 //! for details.
 //!
 //! When hardware interrupts occur while a userspace process is executing, this

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-10-25
+nightly-2021-01-07
diff --git a/shell.nix b/shell.nix
@@ -33,7 +33,7 @@ let
   });
   moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
   nixpkgs = import <nixpkgs> { overlays = [ moz_overlay ]; };
-  rust_date = "2020-10-25";
+  rust_date = "2021-01-07";
   rust_channel = "nightly";
   rust_targets = [
     "thumbv7em-none-eabi" "thumbv7em-none-eabihf" "thumbv6m-none-eabi"

diff --git a/tools/netlify-build.sh b/tools/netlify-build.sh
@@ -11,7 +11,7 @@ set -e
 set -u
 set -x
 
-curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2020-10-25
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2021-01-07
 
 export PATH="$PATH:$HOME/.cargo/bin"