Skip to content

Commit

Permalink
Use crate instead of super
Browse files Browse the repository at this point in the history
  • Loading branch information
ivanizag committed Jul 9, 2024
1 parent 3bfcb70 commit 8ebd6c0
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 38 deletions.
16 changes: 8 additions & 8 deletions src/bdos.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use iz80::*;

use super::bios::Bios;
use super::bdos_environment::*;
use super::bdos_console;
use super::bdos_drive;
use super::bdos_file;
use super::console_emulator::ConsoleEmulator;
use super::cpm_machine::CpmMachine;
use super::constants::*;
use crate::bios::Bios;
use crate::bdos_environment::*;
use crate::bdos_console;
use crate::bdos_drive;
use crate::bdos_file;
use crate::console_emulator::ConsoleEmulator;
use crate::cpm_machine::CpmMachine;
use crate::constants::*;

const BDOS_COMMAND_NAMES: [&str; 106] = [
// 0
Expand Down
4 changes: 2 additions & 2 deletions src/bdos_console.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use iz80::Machine;
use super::bdos_environment::*;
use super::constants::ExecutionResult;
use crate::bdos_environment::*;
use crate::constants::ExecutionResult;

pub fn read(env: &mut BdosEnvironment) -> u8 {
// The Console Input function reads the next console character to register
Expand Down
4 changes: 2 additions & 2 deletions src/bdos_drive.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::bdos_environment::*;
use super::constants::*;
use crate::bdos_environment::*;
use crate::constants::*;
use iz80::Machine;

pub fn select(env: &mut BdosEnvironment, selected: u8) {
Expand Down
8 changes: 4 additions & 4 deletions src/bdos_environment.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use iz80::Machine;

use super::bios::Bios;
use super::console_emulator::ConsoleEmulator;
use super::constants::*;
use super::cpm_machine::*;
use crate::bios::Bios;
use crate::console_emulator::ConsoleEmulator;
use crate::constants::*;
use crate::cpm_machine::*;

pub const RECORD_SIZE: usize = 128;
pub const DEFAULT_DMA: u16 = 0x0080;
Expand Down
6 changes: 3 additions & 3 deletions src/bdos_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ use std::io::Write;
use std::path::Path;
use std::path::PathBuf;

use super::bdos_environment::*;
use super::constants::*;
use super::fcb::*;
use crate::bdos_environment::*;
use crate::constants::*;
use crate::fcb::*;
use iz80::Machine;

// Many file processing functions return a value in register A that is either
Expand Down
8 changes: 4 additions & 4 deletions src/bios.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use iz80::*;

use super::cpm_machine::*;
use super::constants::*;
use super::console_emulator::ConsoleEmulator;
use super::terminal::TerminalEmulator;
use crate::cpm_machine::*;
use crate::constants::*;
use crate::console_emulator::ConsoleEmulator;
use crate::terminal::TerminalEmulator;


pub struct Bios {
Expand Down
2 changes: 1 addition & 1 deletion src/console_test.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use core::panic;
use std::collections::VecDeque;

use super::console_emulator::ConsoleEmulator;
use crate::console_emulator::ConsoleEmulator;

pub enum Step <'a> {
Input(&'a str),
Expand Down
2 changes: 1 addition & 1 deletion src/console_unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::time::Duration;

use termios::*;

use super::console_emulator::ConsoleEmulator;
use crate::console_emulator::ConsoleEmulator;

const STDIN_FD: i32 = 0;

Expand Down
2 changes: 1 addition & 1 deletion src/console_windows.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crossterm::event;
use crossterm::queue;
use crossterm::style;

use super::console_emulator::ConsoleEmulator;
use crate::console_emulator::ConsoleEmulator;

pub struct Console {
next_char: Option<u8>,
Expand Down
2 changes: 1 addition & 1 deletion src/fcb.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use iz80::Machine;
use super::bdos_environment::BdosEnvironment;
use crate::bdos_environment::BdosEnvironment;

/*
File Control Block
Expand Down
20 changes: 10 additions & 10 deletions src/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ use clap::{Arg, App};
use iz80::*;


use super::bdos::Bdos;
use super::bdos::execute_bdos;
use super::console_emulator::ConsoleEmulator;
use super::bios::Bios;
use super::constants::*;
use super::cpm_machine::CpmMachine;
use super::fcb::*;
use super::terminal::TerminalEmulator;
use super::terminal::Transparent;
use super::terminal_adm3a::Adm3aToAnsi;
use crate::bdos::Bdos;
use crate::bdos::execute_bdos;
use crate::console_emulator::ConsoleEmulator;
use crate::bios::Bios;
use crate::constants::*;
use crate::cpm_machine::CpmMachine;
use crate::fcb::*;
use crate::terminal::TerminalEmulator;
use crate::terminal::Transparent;
use crate::terminal_adm3a::Adm3aToAnsi;

// Welcome message
const WELCOME: &str =
Expand Down
2 changes: 1 addition & 1 deletion src/terminal_adm3a.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::terminal::TerminalEmulator;
use crate::terminal::TerminalEmulator;

/*
See:
Expand Down

0 comments on commit 8ebd6c0

Please sign in to comment.