Rename: Environment -> Env

type: reform
casey · Apr 8, 2020 · fd06943 · fd06943
1 parent 7420c91
commit fd06943
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/src/common.rs b/src/common.rs
@@ -37,8 +37,8 @@ pub(crate) use crate::{
 
 // structs and enums
 pub(crate) use crate::{
-  environment::Environment, error::Error, file_info::FileInfo, hasher::Hasher, info::Info,
-  metainfo::Metainfo, mode::Mode, opt::Opt, subcommand::Subcommand, torrent::Torrent,
+  env::Env, error::Error, file_info::FileInfo, hasher::Hasher, info::Info, metainfo::Metainfo,
+  mode::Mode, opt::Opt, subcommand::Subcommand, torrent::Torrent,
 };
 
 // test modules

diff --git a/src/environment.rs → src/env.rs b/src/environment.rs → src/env.rs
@@ -1,12 +1,12 @@
 use crate::common::*;
 
-pub(crate) struct Environment {
+pub(crate) struct Env {
   args: Vec<String>,
   dir: Box<dyn AsRef<Path>>,
   pub(crate) err: Box<dyn Write>,
 }
 
-impl Environment {
+impl Env {
   pub(crate) fn main() -> Self {
     let dir = match env::current_dir() {
       Ok(dir) => dir,

diff --git a/src/main.rs b/src/main.rs
@@ -30,7 +30,7 @@ mod testing;
 mod bencode;
 mod common;
 mod consts;
-mod environment;
+mod env;
 mod error;
 mod file_info;
 mod hasher;
@@ -46,7 +46,7 @@ mod subcommand;
 mod torrent;
 
 fn main() {
-  if let Err(code) = Environment::main().status() {
+  if let Err(code) = Env::main().status() {
     process::exit(code);
   }
 }
diff --git a/src/opt.rs b/src/opt.rs
@@ -9,7 +9,7 @@ pub(crate) struct Opt {
 }
 
 impl Opt {
-  pub(crate) fn run(self, env: &mut Environment) -> Result<(), Error> {
+  pub(crate) fn run(self, env: &mut Env) -> Result<(), Error> {
     self.subcommand.run(env, self.unstable)
   }
 }
diff --git a/src/subcommand.rs b/src/subcommand.rs
@@ -6,7 +6,7 @@ pub(crate) enum Subcommand {
 }
 
 impl Subcommand {
-  pub(crate) fn run(self, env: &mut Environment, unstable: bool) -> Result<(), Error> {
+  pub(crate) fn run(self, env: &mut Env, unstable: bool) -> Result<(), Error> {
     match self {
       Self::Torrent(torrent) => torrent.run(env, unstable),
     }

diff --git a/src/testing.rs b/src/testing.rs
@@ -2,8 +2,8 @@ use crate::common::*;
 
 use std::{io::Cursor, iter};
 
-pub(crate) fn environment(iter: impl IntoIterator<Item = impl Into<String>>) -> Environment {
-  Environment::new(
+pub(crate) fn env(iter: impl IntoIterator<Item = impl Into<String>>) -> Env {
+  Env::new(
     tempfile::tempdir().unwrap(),
     Cursor::new(Vec::new()),
     iter::once(String::from("imdl")).chain(iter.into_iter().map(|item| item.into())),

diff --git a/src/torrent.rs b/src/torrent.rs
@@ -10,7 +10,7 @@ pub(crate) enum Torrent {
 }
 
 impl Torrent {
-  pub(crate) fn run(self, env: &mut Environment, unstable: bool) -> Result<(), Error> {
+  pub(crate) fn run(self, env: &mut Env, unstable: bool) -> Result<(), Error> {
     match self {
       Self::Create(create) => create.run(env),
       Self::Stats(stats) => stats.run(env, unstable),

diff --git a/src/torrent/create.rs b/src/torrent/create.rs
@@ -25,7 +25,7 @@ pub(crate) struct Create {
 }
 
 impl Create {
-  pub(crate) fn run(self, env: &Environment) -> Result<(), Error> {
+  pub(crate) fn run(self, env: &Env) -> Result<(), Error> {
     let input = env.resolve(&self.input);
 
     let mut announce_list = Vec::new();
@@ -125,8 +125,8 @@ impl Create {
 mod tests {
   use super::*;
 
-  fn environment(args: &[&str]) -> Environment {
-    testing::environment(["torrent", "create"].iter().chain(args).cloned())
+  fn environment(args: &[&str]) -> Env {
+    testing::env(["torrent", "create"].iter().chain(args).cloned())
   }
 
   #[test]

diff --git a/src/torrent/stats.rs b/src/torrent/stats.rs
@@ -11,7 +11,7 @@ pub(crate) struct Stats {
 }
 
 impl Stats {
-  pub(crate) fn run(self, env: &mut Environment, unstable: bool) -> Result<(), Error> {
+  pub(crate) fn run(self, env: &mut Env, unstable: bool) -> Result<(), Error> {
     if !unstable {
       return Err(Error::Unstable {
         feature: "torrent stats subcommand",