Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to nightly-2022-06-25 #474

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
# Manually sync this with rust-toolchain.toml!
RUST_VERSION=nightly-2022-04-24 \
RUST_VERSION=nightly-2022-06-25 \
RUST_COMPONENTS="clippy llvm-tools-preview rustfmt rust-src" \
RUST_TARGETS="x86_64-unknown-none"

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
# Manually sync this with Dockerfile!
channel = "nightly-2022-05-15"
channel = "nightly-2022-06-25"
components = [
"clippy",
"llvm-tools-preview",
Expand Down
4 changes: 2 additions & 2 deletions src/arch/x86_64/kernel/pci.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static mut PCI_ADAPTERS: Vec<PciAdapter> = Vec::new();
static mut PCI_DRIVERS: Vec<PciDriver<'_>> = Vec::new();

/// Classes of PCI nodes.
#[derive(Copy, Clone, Debug, FromPrimitive, ToPrimitive, PartialEq)]
#[derive(Copy, Clone, Debug, FromPrimitive, ToPrimitive, PartialEq, Eq)]
pub enum PciClassCode {
TooOld = 0x00,
MassStorage = 0x01,
Expand All @@ -71,7 +71,7 @@ pub enum PciClassCode {
}

/// Network Controller Sub Classes
#[derive(Copy, Clone, Debug, FromPrimitive, ToPrimitive, PartialEq)]
#[derive(Copy, Clone, Debug, FromPrimitive, ToPrimitive, PartialEq, Eq)]
pub enum PciNetworkControllerSubclass {
Ethernet = 0x00,
TokenRing = 0x01,
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/net/virtio_net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,7 @@ pub mod constants {
/// wrapping a u64.
///
/// The main functionality of this type are functions implemented on it.
#[derive(Debug, Copy, Clone, PartialOrd, PartialEq)]
#[derive(Debug, Copy, Clone, PartialOrd, PartialEq, Eq)]
pub struct FeatureSet(u64);

impl BitOr for FeatureSet {
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/virtio/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub mod features {
/// Virtio's feature bits inside an enum.
/// See Virtio specification v1.1. - 6
#[allow(dead_code, non_camel_case_types)]
#[derive(Clone, Copy, Debug, PartialEq)]
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[repr(u64)]
pub enum Features {
VIRTIO_F_RING_INDIRECT_DESC = 1 << 28,
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/virtio/transport/pci.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ impl From<u16> for DevId {
// implementation, in order catch all cases correctly,
// as this function uses the catch-all "_" case!
#[allow(dead_code, non_camel_case_types, clippy::upper_case_acronyms)]
#[derive(Copy, Clone, PartialEq)]
#[derive(Copy, Clone, PartialEq, Eq)]
#[repr(u8)]
pub enum CfgType {
INVALID = 0,
Expand Down
4 changes: 2 additions & 2 deletions src/drivers/virtio/virtqueue/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use core::ops::{BitAnd, Deref, DerefMut};
/// smaller-equal to `min(u16::MAX , T::MAX)`.
///
/// Currently implements `From<u16>` and `From<u32>`.
#[derive(Copy, Clone, Debug, PartialOrd, PartialEq)]
#[derive(Copy, Clone, Debug, PartialOrd, PartialEq, Eq)]
pub struct VqIndex(u16);

impl From<u16> for VqIndex {
Expand Down Expand Up @@ -64,7 +64,7 @@ impl From<u32> for VqIndex {
/// smaller-equal to `min(u16::MAX , T::MAX)`.
///
/// Currently implements `From<u16>` and `From<u32>`.
#[derive(Copy, Clone, Debug, PartialOrd, PartialEq)]
#[derive(Copy, Clone, Debug, PartialOrd, PartialEq, Eq)]
pub struct VqSize(u16);

impl From<u16> for VqSize {
Expand Down