Skip to content

Commit 75cb55f

Browse files
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 <[email protected]>
2 parents 24b1138 + dd173d9 commit 75cb55f

File tree

12 files changed

+12
-13
lines changed

12 files changed

+12
-13
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"editor.formatOnSave": true,
3-
"rust-client.channel": "nightly-2020-10-25",
3+
"rust-client.channel": "nightly-2021-01-07",
44
}

capsules/src/st77xx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! ST77xx Screen
22
//!
3-
//! - https://learn.adafruit.com/adafruit-1-3-and-1-54-240-x-240-wide-angle-tft-lcd-displays
3+
//! - <https://learn.adafruit.com/adafruit-1-3-and-1-54-240-x-240-wide-angle-tft-lcd-displays>
44
//!
55
//! The screen supports multiple physical busses, and this driver is implemented
66
//! on top of the generic `Bus` interface.

capsules/src/usb/ctap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Client to Authenticator Protocol CTAPv2 over USB HID
22
//!
3-
//! 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
3+
//! 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>
44
55
use core::cell::Cell;
66
use core::cmp;

chips/earlgrey/src/aes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Support for the AES hardware block on OpenTitan
22
//!
3-
//! https://docs.opentitan.org/hw/ip/aes/doc/
3+
//! <https://docs.opentitan.org/hw/ip/aes/doc/>
44
55
use kernel::common::cells::{OptionalCell, TakeCell};
66
use kernel::common::registers::{

chips/imxrt10xx/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![crate_name = "imxrt10xx"]
66
#![crate_type = "rlib"]
77
#![feature(const_fn)]
8-
#![feature(min_const_generics)] // Stabilized in Rust 1.51 (https://github.com/rust-lang/rust/pull/79135)
98
#![no_std]
109

1110
pub mod chip;

doc/Getting_Started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ of installing some of these tools, but you can also install them yourself.
7575

7676
#### Rust (nightly)
7777

78-
We are using `nightly-2020-10-25`. We require
78+
We are using `nightly-2021-01-07`. We require
7979
installing it with [rustup](http://www.rustup.rs) so you can manage multiple
8080
versions of Rust and continue using stable versions for other Rust code:
8181

@@ -90,7 +90,7 @@ to your `$PATH`.
9090
Then install the correct nightly version of Rust:
9191

9292
```bash
93-
$ rustup install nightly-2020-10-25
93+
$ rustup install nightly-2021-01-07
9494
```
9595

9696
#### Tockloader

kernel/src/debug.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ use crate::ReturnCode;
7070
/// Also, in our use cases, writes are infaillible, so the write function just doesn't return
7171
/// anything.
7272
///
73-
/// See also the tracking issue: https://github.com/rust-lang/rfcs/issues/2262
73+
/// See also the tracking issue: <https://github.com/rust-lang/rfcs/issues/2262>
7474
pub trait IoWrite {
7575
fn write(&mut self, buf: &[u8]);
7676

kernel/src/platform/mpu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl Region {
5353
/// Null type for the default type of the `MpuConfig` type in an implementation
5454
/// of the `MPU` trait. We need this to workaround a bug in the Rust compiler.
5555
///
56-
/// Depending how https://github.com/rust-lang/rust/issues/65774 is resolved we
56+
/// Depending how <https://github.com/rust-lang/rust/issues/65774> is resolved we
5757
/// may be able to remove this type, but only if a default `Display` is
5858
/// provided for the `()` type.
5959
#[derive(Default)]

kernel/src/sched/round_robin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//!
33
//! This scheduler is specifically a Round Robin Scheduler with Interrupts.
44
//!
5-
//! See: https://www.eecs.umich.edu/courses/eecs461/lecture/SWArchitecture.pdf
5+
//! See: <https://www.eecs.umich.edu/courses/eecs461/lecture/SWArchitecture.pdf>
66
//! for details.
77
//!
88
//! When hardware interrupts occur while a userspace process is executing, this

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-10-25
1+
nightly-2021-01-07

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ let
3333
});
3434
moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
3535
nixpkgs = import <nixpkgs> { overlays = [ moz_overlay ]; };
36-
rust_date = "2020-10-25";
36+
rust_date = "2021-01-07";
3737
rust_channel = "nightly";
3838
rust_targets = [
3939
"thumbv7em-none-eabi" "thumbv7em-none-eabihf" "thumbv6m-none-eabi"

tools/netlify-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111
set -u
1212
set -x
1313

14-
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2020-10-25
14+
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2021-01-07
1515

1616
export PATH="$PATH:$HOME/.cargo/bin"
1717

0 commit comments

Comments
 (0)