Ver código fonte

fix compile errors in rust 1.89 nightly (#2)

Signed-off-by: longjin <longjin@DragonOS.org>
LoGin 5 dias atrás
pai
commit
626801cb5f
3 arquivos alterados com 33 adições e 19 exclusões
  1. 9 1
      src/lib.rs
  2. 21 16
      src/output.rs
  3. 3 2
      src/parser.rs

+ 9 - 1
src/lib.rs

@@ -118,10 +118,18 @@ use core::{ffi::*, fmt};
 pub mod output;
 mod parser;
 use argument::*;
+use core::convert::From;
 pub use parser::format;
 pub mod argument {
     use super::*;
-
+    use core::prelude::rust_2024::derive;
+    use core::cmp::*;
+    use core::marker::*;
+    use core::clone::Clone;
+    use core::hash::Hash;
+    use core::matches;
+    use core::option::Option::{self, Some, None};
+    use crate::fmt::Debug;
     bitflags::bitflags! {
         /// Flags field.
         ///

+ 21 - 16
src/output.rs

@@ -1,9 +1,14 @@
 //! Various ways to output formatting data.
 
 use core::cell::Cell;
+use core::default::Default;
 use core::ffi::*;
 use core::fmt;
+use core::ops::FnMut;
+use core::option::Option;
+use core::result::Result::{Ok, Err};
 use core::str::from_utf8;
+use core::write;
 
 #[cfg(feature = "std")]
 pub use yes_std::*;
@@ -66,7 +71,7 @@ macro_rules! define_numeric {
             if $flags.contains(Flags::PREPEND_PLUS) {
                 write!(
                     $w,
-                    concat!("{:<+width$.prec$", $ty, "}"),
+                    core::concat!("{:<+width$.prec$", $ty, "}"),
                     $data,
                     width = $width as usize,
                     prec = $precision as usize
@@ -74,7 +79,7 @@ macro_rules! define_numeric {
             } else if $flags.contains(Flags::PREPEND_SPACE) && !$data.is_sign_negative() {
                 write!(
                     $w,
-                    concat!(" {:<width$.prec$", $ty, "}"),
+                    core::concat!(" {:<width$.prec$", $ty, "}"),
                     $data,
                     width = ($width as usize).wrapping_sub(1),
                     prec = $precision as usize
@@ -82,7 +87,7 @@ macro_rules! define_numeric {
             } else {
                 write!(
                     $w,
-                    concat!("{:<width$.prec$", $ty, "}"),
+                    core::concat!("{:<width$.prec$", $ty, "}"),
                     $data,
                     width = $width as usize,
                     prec = $precision as usize
@@ -92,7 +97,7 @@ macro_rules! define_numeric {
             if $flags.contains(Flags::PREPEND_ZERO) {
                 write!(
                     $w,
-                    concat!("{:+0width$.prec$", $ty, "}"),
+                    core::concat!("{:+0width$.prec$", $ty, "}"),
                     $data,
                     width = $width as usize,
                     prec = $precision as usize
@@ -100,7 +105,7 @@ macro_rules! define_numeric {
             } else {
                 write!(
                     $w,
-                    concat!("{:+width$.prec$", $ty, "}"),
+                    core::concat!("{:+width$.prec$", $ty, "}"),
                     $data,
                     width = $width as usize,
                     prec = $precision as usize
@@ -111,7 +116,7 @@ macro_rules! define_numeric {
                 let mut d = DummyWriter(0);
                 let _ = write!(
                     d,
-                    concat!("{:.prec$", $ty, "}"),
+                    core::concat!("{:.prec$", $ty, "}"),
                     $data,
                     prec = $precision as usize
                 );
@@ -120,7 +125,7 @@ macro_rules! define_numeric {
                 }
                 write!(
                     $w,
-                    concat!(" {:0width$.prec$", $ty, "}"),
+                    core::concat!(" {:0width$.prec$", $ty, "}"),
                     $data,
                     width = ($width as usize).wrapping_sub(1),
                     prec = $precision as usize
@@ -128,7 +133,7 @@ macro_rules! define_numeric {
             } else {
                 write!(
                     $w,
-                    concat!("{:0width$.prec$", $ty, "}"),
+                    core::concat!("{:0width$.prec$", $ty, "}"),
                     $data,
                     width = $width as usize,
                     prec = $precision as usize
@@ -139,7 +144,7 @@ macro_rules! define_numeric {
                 let mut d = DummyWriter(0);
                 let _ = write!(
                     d,
-                    concat!("{:.prec$", $ty, "}"),
+                    core::concat!("{:.prec$", $ty, "}"),
                     $data,
                     prec = $precision as usize
                 );
@@ -149,7 +154,7 @@ macro_rules! define_numeric {
             }
             write!(
                 $w,
-                concat!("{:width$.prec$", $ty, "}"),
+                core::concat!("{:width$.prec$", $ty, "}"),
                 $data,
                 width = $width as usize,
                 prec = $precision as usize
@@ -167,14 +172,14 @@ macro_rules! define_unumeric {
             if $flags.contains(Flags::ALTERNATE_FORM) {
                 write!(
                     $w,
-                    concat!("{:<#width$", $ty, "}"),
+                    core::concat!("{:<#width$", $ty, "}"),
                     $data,
                     width = $width as usize
                 )
             } else {
                 write!(
                     $w,
-                    concat!("{:<width$", $ty, "}"),
+                    core::concat!("{:<width$", $ty, "}"),
                     $data,
                     width = $width as usize
                 )
@@ -183,14 +188,14 @@ macro_rules! define_unumeric {
             if $flags.contains(Flags::PREPEND_ZERO) {
                 write!(
                     $w,
-                    concat!("{:#0width$", $ty, "}"),
+                    core::concat!("{:#0width$", $ty, "}"),
                     $data,
                     width = $width as usize
                 )
             } else {
                 write!(
                     $w,
-                    concat!("{:#width$", $ty, "}"),
+                    core::concat!("{:#width$", $ty, "}"),
                     $data,
                     width = $width as usize
                 )
@@ -198,14 +203,14 @@ macro_rules! define_unumeric {
         } else if $flags.contains(Flags::PREPEND_ZERO) {
             write!(
                 $w,
-                concat!("{:0width$", $ty, "}"),
+                core::concat!("{:0width$", $ty, "}"),
                 $data,
                 width = $width as usize
             )
         } else {
             write!(
                 $w,
-                concat!("{:width$", $ty, "}"),
+                core::concat!("{:width$", $ty, "}"),
                 $data,
                 width = $width as usize
             )

+ 3 - 2
src/parser.rs

@@ -1,6 +1,7 @@
-use core::ffi::*;
-
 use crate::{Argument, DoubleFormat, Flags, SignedInt, Specifier, UnsignedInt};
+use core::ffi::*;
+use core::ops::FnMut;
+use core::option::Option::{self, None, Some};
 use itertools::Itertools;
 
 fn next_char(sub: &[u8]) -> &[u8] {