Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
georgesFoundation committed Aug 28, 2024
1 parent 87462a8 commit 327c930
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

# Keep this in sync. with the CI.
[toolchain]
channel = "1.74"
channel = "1.75"
profile = "default"
targets = ["thumbv7em-none-eabihf"]
34 changes: 17 additions & 17 deletions stratum-v1/examples/tokio-cli.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: © 2024 Foundation Devices, Inc. <[email protected]>
// SPDX-License-Identifier: GPL-3.0-or-later

#![allow(static_mut_refs)]
// #![allow(static_mut_refs)]

use stratum_v1::{Client, Extensions, Message, Share, VersionRolling};

use heapless::{String, Vec};
use inquire::Select;
use log::{debug, error};
use log::error;
use std::{
net::{Ipv4Addr, SocketAddr},
str::FromStr,
Expand Down Expand Up @@ -162,23 +162,23 @@ mod adapter {
Self { inner }
}

/// Consume the adapter, returning the inner object.
pub fn into_inner(self) -> T {
self.inner
}
// /// Consume the adapter, returning the inner object.
// pub fn into_inner(self) -> T {
// self.inner
// }
}

impl<T: ?Sized> FromTokio<T> {
/// Borrow the inner object.
pub fn inner(&self) -> &T {
&self.inner
}

/// Mutably borrow the inner object.
pub fn inner_mut(&mut self) -> &mut T {
&mut self.inner
}
}
// impl<T: ?Sized> FromTokio<T> {
// /// Borrow the inner object.
// pub fn inner(&self) -> &T {
// &self.inner
// }

// /// Mutably borrow the inner object.
// pub fn inner_mut(&mut self) -> &mut T {
// &mut self.inner
// }
// }

impl<T: ?Sized> embedded_io::ErrorType for FromTokio<T> {
type Error = std::io::Error;
Expand Down
2 changes: 1 addition & 1 deletion stratum-v1/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub enum Error {
HexError(faster_hex::Error),
}

impl core::error::Error for Error {}
// impl core::error::Error for Error {}

impl core::fmt::Display for Error {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
Expand Down
6 changes: 3 additions & 3 deletions stratum-v1/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//! This library provides client side functions to create requests and parse responses for Stratum v1 protocol.

#![no_std]
#![allow(static_mut_refs)]
#![allow(stable_features)] // remove this once rust 1.81 is stable
#![feature(error_in_core)]
// #![allow(static_mut_refs)]
// #![allow(stable_features)] // remove this once rust 1.81 is stable
// #![feature(error_in_core)]
#![macro_use]
pub(crate) mod fmt;

Expand Down

0 comments on commit 327c930

Please sign in to comment.