Skip to content

Commit

Permalink
Join imports
Browse files Browse the repository at this point in the history
  • Loading branch information
nickdrozd committed Apr 20, 2024
1 parent 4190013 commit e9e8bb5
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 20 deletions.
8 changes: 5 additions & 3 deletions src/blocks.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
use pyo3::pyfunction;

use crate::instrs::{Color, Shift};
use crate::parse::tcompile;
use crate::tape::{BasicTape, Count};
use crate::{
instrs::{Color, Shift},
parse::tcompile,
tape::{BasicTape, Count},
};

struct BlockMeasure {
tape: BasicTape,
Expand Down
8 changes: 5 additions & 3 deletions src/machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ use std::collections::HashMap;

use pyo3::{pyclass, pyfunction, pymethods};

use crate::instrs::{Slot, State};
use crate::parse::tcompile;
use crate::tape::{BasicTape as Tape, Count, HeadTape};
use crate::{
instrs::{Slot, State},
parse::tcompile,
tape::{BasicTape as Tape, Count, HeadTape},
};

type Step = u64;

Expand Down
8 changes: 5 additions & 3 deletions src/reason.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ use std::collections::{HashMap, HashSet};

use pyo3::pyfunction;

use crate::instrs::{Color, CompThin, Instr, Shift, Slot, State};
use crate::parse::{parse, parse_to_vec, tcompile};
use crate::tape::BasicTape as Tape;
use crate::{
instrs::{Color, CompThin, Instr, Shift, Slot, State},
parse::{parse, parse_to_vec, tcompile},
tape::BasicTape as Tape,
};

type Step = u64;

Expand Down
3 changes: 1 addition & 2 deletions src/rules.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::collections::HashMap;

use pyo3::create_exception;
use pyo3::exceptions::PyException;
use pyo3::{create_exception, exceptions::PyException};

use crate::tape::{Count, Index, IndexTape};

Expand Down
8 changes: 5 additions & 3 deletions src/tape.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use core::cell::Cell;
use core::fmt::{Display, Formatter, Result};
use core::iter::{once, repeat};
use core::{
cell::Cell,
fmt::{Display, Formatter, Result},
iter::{once, repeat},
};

use crate::instrs::{Color, Shift};

Expand Down
10 changes: 4 additions & 6 deletions src/tree.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
use pyo3::create_exception;
use pyo3::exceptions::PyException;
use pyo3::{pyfunction, PyResult};
use pyo3::{
create_exception, exceptions::PyException, pyfunction, PyResult,
};

use crate::instrs::Slot;
use crate::parse::tcompile;
use crate::tape::BasicTape as Tape;
use crate::{instrs::Slot, parse::tcompile, tape::BasicTape as Tape};

type Step = u64;

Expand Down

0 comments on commit e9e8bb5

Please sign in to comment.