Improve ergonomics

danaugrs · Nov 10, 2024 · 1237489 · 1237489
1 parent a05015d
commit 1237489
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,6 @@ Provides a macro to simplify operator overloading. See the [documentation](https
 ```rust
 extern crate overload;
 use overload::overload;
-use std::ops; // <- don't forget this or you'll get nasty errors
 
 #[derive(PartialEq, Debug)]
 struct Val {
@@ -24,28 +23,28 @@ overload!((a: ?Val) + (b: ?Val) -> Val { Val { v: a.v + b.v } });
 The macro call in the snippet above generates the following code:
 
 ```rust
-impl ops::Add<Val> for Val {
+impl std::ops::Add<Val> for Val {
     type Output = Val;
     fn add(self, b: Val) -> Self::Output {
         let a = self;
         Val { v: a.v + b.v }
     }
 }
-impl ops::Add<&Val> for Val {
+impl std::ops::Add<&Val> for Val {
     type Output = Val;
     fn add(self, b: &Val) -> Self::Output {
         let a = self;
         Val { v: a.v + b.v }
     }
 }
-impl ops::Add<Val> for &Val {
+impl std::ops::Add<Val> for &Val {
     type Output = Val;
     fn add(self, b: Val) -> Self::Output {
         let a = self;
         Val { v: a.v + b.v }
     }
 }
-impl ops::Add<&Val> for &Val {
+impl std::ops::Add<&Val> for &Val {
     type Output = Val;
     fn add(self, b: &Val) -> Self::Output {
         let a = self;

diff --git a/src/assignment.rs b/src/assignment.rs
@@ -17,7 +17,7 @@ macro_rules! _overload_assignment {
 #[macro_export(local_inner_macros)]
 macro_rules! _overload_assignment_internal {
     ($op_trait:ident, $op_fn:ident, $li:ident, $lt:ty, $ri:ident, $rt:ty, $body:block) => (        
-        impl ops::$op_trait<$rt> for $lt {
+        impl std::ops::$op_trait<$rt> for $lt {
             fn $op_fn(&mut self, $ri: $rt) {
                 let $li = self;
                 $body

diff --git a/src/binary.rs b/src/binary.rs
@@ -17,7 +17,7 @@ macro_rules! _overload_binary {
 #[macro_export(local_inner_macros)]
 macro_rules! _overload_binary_internal {
     ($op_trait:ident, $op_fn:ident, $li:ident, $lt:ty, $ri:ident, $rt:ty, $out:ty, $body:block) => (
-        impl ops::$op_trait<$rt> for $lt {
+        impl std::ops::$op_trait<$rt> for $lt {
             type Output = $out;
             fn $op_fn(self, $ri: $rt) -> Self::Output {
                 let $li = self;

diff --git a/src/lib.rs b/src/lib.rs
@@ -4,7 +4,6 @@
 //! ```
 //! extern crate overload;
 //! use overload::overload;
-//! use std::ops; // <- don't forget this or you'll get nasty errors
 //! ```
 //! 
 //! # Introduction
@@ -20,7 +19,6 @@
 //! ```
 //! # extern crate overload;
 //! # use overload::overload;
-//! # use std::ops;
 //! # #[derive(PartialEq, Debug)]
 //! # struct Val {
 //! #   v: i32
@@ -41,7 +39,6 @@
 //! ```
 //! # extern crate overload;
 //! # use overload::overload;
-//! # use std::ops;
 //! # #[derive(PartialEq, Debug)]
 //! # struct Val {
 //! #   v: i32
@@ -56,7 +53,6 @@
 //! ```
 //! # extern crate overload;
 //! # use overload::overload;
-//! # use std::ops;
 //! # #[derive(PartialEq, Debug)]
 //! # struct Val {
 //! #   v: i32
@@ -67,7 +63,6 @@
 //! ```
 //! # extern crate overload;
 //! # use overload::overload;
-//! # use std::ops;
 //! # #[derive(PartialEq, Debug)]
 //! # struct Val {
 //! #   v: i32
@@ -83,7 +78,6 @@
 //! ```
 //! # extern crate overload;
 //! # use overload::overload;
-//! # use std::ops;
 //! # #[derive(PartialEq, Debug)]
 //! # struct Val {
 //! #   v: i32
@@ -128,7 +122,6 @@
 //! ```
 //! # extern crate overload;
 //! # use overload::overload;
-//! # use std::ops;
 //! # #[derive(PartialEq, Debug)]
 //! # struct Val {
 //! #   v: i32
@@ -150,8 +143,8 @@
 //! 
 //! The last line of the body needs to be an expression (i.e. no `;` at the end of the line) of type `<out_type>`.
 //! 
-//! | Operator | Example                                                         | Trait  |
-//! |----------|-----------------------------------------------------------------|--------|
+//! | Operator | Example                                                          | Trait  |
+//! |----------|------------------------------------------------------------------|--------|
 //! | +        | `overload!((a: A) + (b: B) -> C { /*...*/ });`                   | Add    |           
 //! | -        | `overload!((a: A) - (b: B) -> C { /*...*/ });`                   | Sub    |
 //! | *        | `overload!((a: A) * (b: B) -> C { /*...*/ });`                   | Mul    |

diff --git a/src/unary.rs b/src/unary.rs
@@ -9,7 +9,7 @@ macro_rules! _overload_unary {
 #[macro_export(local_inner_macros)]
 macro_rules! _overload_unary_internal {
     ($op_trait:ident, $op_fn:ident, $i:ident, $t:ty, $out:ty, $body:block) => (        
-        impl ops::$op_trait for $t {
+        impl std::ops::$op_trait for $t {
             type Output = $out;
             fn $op_fn(self) -> Self::Output {
                 let $i = self;

diff --git a/tests/assignment.rs b/tests/assignment.rs
@@ -1,6 +1,5 @@
 extern crate overload;
 use overload::overload;
-use std::ops;
 
 #[derive(PartialEq, Debug)]
 struct A(i32);

diff --git a/tests/binary.rs b/tests/binary.rs
@@ -1,6 +1,5 @@
 extern crate overload;
 use overload::overload;
-use std::ops;
 
 #[derive(PartialEq, Debug)]
 struct A(i32);

diff --git a/tests/unary.rs b/tests/unary.rs
@@ -1,6 +1,5 @@
 extern crate overload;
 use overload::overload;
-use std::ops;
 
 #[derive(PartialEq, Debug)]
 struct A(i32);