Skip to content

Commit

Permalink
clippy shadow modules
Browse files Browse the repository at this point in the history
  • Loading branch information
howardwu committed Jan 20, 2024
1 parent 705fa3f commit 30e9052
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .rusty-hook.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[hooks]
pre-commit = "cargo clippy --workspace --all-targets --all-features && cargo +nightly fmt --all -- --check"
pre-commit = "cargo +nightly fmt --all -- --check && cargo clippy --workspace --all-targets --all-features"

[logging]
verbose = true
2 changes: 1 addition & 1 deletion algorithms/src/snark/varuna/ahp/prover/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ pub(crate) use oracles::*;
mod round_functions;

mod state;
pub(self) use state::*;
use state::*;
32 changes: 31 additions & 1 deletion console/network/environment/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,37 @@ pub mod traits;
pub use traits::*;

pub mod prelude {
pub use crate::{environment::*, helpers::*, traits::*};
pub use crate::{
environment::*,
helpers::*,
traits::{
algorithms::*,
arithmetic::*,
bitwise::*,
from_bits::*,
from_field::*,
parse::*,
parse_string::*,
to_bits_le,
to_field::*,
type_name::*,
types::{
integer_magnitude::Magnitude,
integer_type::{
CheckedPow,
CheckedShl,
IntegerProperties,
IntegerType,
WrappingDiv,
WrappingPow,
WrappingRem,
},
*,
},
visibility::*,
ToBits,
},
};

pub use snarkvm_curves::{AffineCurve, MontgomeryParameters, ProjectiveCurve, TwistedEdwardsParameters};
pub use snarkvm_fields::{Field as _, PrimeField as _, SquareRootField as _, Zero as _};
Expand Down
4 changes: 2 additions & 2 deletions console/network/environment/src/traits/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

pub use snarkvm_utilities::{to_bits_le, ToBits};

pub mod algorithms;
pub use algorithms::*;

Expand All @@ -33,8 +35,6 @@ pub use parse::*;
pub mod parse_string;
pub use parse_string::string_parser;

pub use snarkvm_utilities::{to_bits_le, ToBits};

pub mod to_field;
pub use to_field::*;

Expand Down
2 changes: 1 addition & 1 deletion console/types/integers/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub use snarkvm_console_network_environment::prelude::*;
pub use snarkvm_console_types_boolean::Boolean;
pub use snarkvm_console_types_field::Field;

use snarkvm_console_network_environment::traits::types::{integer_magnitude::Magnitude, integer_type::IntegerType};
use snarkvm_console_network_environment::traits::{IntegerType, Magnitude};
use snarkvm_console_types_scalar::Scalar;

use core::marker::PhantomData;
Expand Down

0 comments on commit 30e9052

Please sign in to comment.