small optimizations

mojolicious · Apr 6, 2012 · aeb813b · aeb813b
1 parent 30e5d74
commit aeb813b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 27 deletions.
diff --git a/lib/Mojo/Asset/Memory.pm b/lib/Mojo/Asset/Memory.pm
@@ -2,7 +2,7 @@ package Mojo::Asset::Memory;
 use Mojo::Base 'Mojo::Asset';
 
 use Carp 'croak';
-use IO::File;
+use IO::Handle;
 use Mojo::Asset::File;
 
 has 'auto_upgrade';
@@ -48,8 +48,7 @@ sub get_chunk {
 
 sub move_to {
   my ($self, $path) = @_;
-  croak qq/Can't open file "$path": $!/
-    unless my $file = IO::File->new("> $path");
+  croak qq/Can't open file "$path": $!/ unless open my $file, '>', $path;
   croak qq/Can't write to file "$path": $!/
     unless defined $file->syswrite($self->{content});
   return $self;

diff --git a/lib/Mojo/Command.pm b/lib/Mojo/Command.pm
@@ -5,7 +5,7 @@ use Carp 'croak';
 use Cwd 'getcwd';
 use File::Path 'mkpath';
 use File::Spec::Functions qw/catdir catfile splitdir/;
-use IO::File;
+use IO::Handle;
 use Mojo::Server;
 use Mojo::Template;
 use Mojo::Util qw/b64_decode decamelize/;
@@ -136,8 +136,7 @@ sub write_file {
   $self->create_dir($dir);
 
   # Write unbuffered
-  croak qq/Can't open file "$path": $!/
-    unless my $file = IO::File->new("> $path");
+  croak qq/Can't open file "$path": $!/ unless open my $file, '>', $path;
   croak qq/Can't write to file "$path": $!/
     unless defined $file->syswrite($data);
   say "  [write] $path" unless $self->quiet;

diff --git a/lib/Mojo/Exception.pm b/lib/Mojo/Exception.pm
@@ -5,7 +5,6 @@ use overload
   '""'     => sub { shift->to_string },
   fallback => 1;
 
-use IO::File;
 use Scalar::Util 'blessed';
 
 has [qw/frames line lines_before lines_after/] => sub { [] };
@@ -71,7 +70,7 @@ sub _detect {
   # Search for context
   for my $frame (reverse @trace) {
     next unless -r $frame->[0];
-    my $handle = IO::File->new($frame->[0], '<:utf8');
+    open my $handle, '<:utf8', $frame->[0];
     $self->_parse_context($frame->[1], [[<$handle>]]);
     return $self;
   }

diff --git a/lib/Mojo/Log.pm b/lib/Mojo/Log.pm
@@ -3,16 +3,15 @@ use Mojo::Base 'Mojo::EventEmitter';
 
 use Carp 'croak';
 use Fcntl ':flock';
-use IO::File;
+use IO::Handle;
 
 has handle => sub {
   my $self = shift;
 
   # File
   if (my $path = $self->path) {
     croak qq/Can't open log file "$path": $!/
-      unless my $file = IO::File->new(">> $path");
-    binmode $file, ':utf8';
+      unless open my $file, '>>:utf8', $path;
     return $file;
   }
 
@@ -134,7 +133,7 @@ L<Mojo::Log> implements the following attributes.
 =head2 C<handle>
 
   my $handle = $log->handle;
-  $log       = $log->handle(IO::File->new);
+  $log       = $log->handle(IO::Handle->new);
 
 Log file handle used by default C<message> event, defaults to opening C<path>
 or C<STDERR>.

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -5,7 +5,6 @@ use Cwd 'abs_path';
 use Fcntl ':flock';
 use File::Basename 'dirname';
 use File::Spec::Functions qw/catfile tmpdir/;
-use IO::File;
 use IO::Poll 'POLLIN';
 use List::Util 'shuffle';
 use Mojo::Server::Daemon;
@@ -256,7 +255,7 @@ sub _manage {
 }
 
 sub _pid {
-  return unless my $file = IO::File->new(shift->{config}->{pid_file}, '<');
+  return unless open my $file, '<', shift->{config}->{pid_file};
   my $pid = <$file>;
   chomp $pid;
   return $pid;
@@ -274,7 +273,8 @@ sub _pid_file {
   # Create PID file
   $self->{log}->info(qq/Creating process id file "$file"./);
   die qq/Can't create process id file "$file": $!/
-    unless my $pid = IO::File->new($file, '>', 0644);
+    unless open my $pid, '>', $file;
+  chmod 0644, $pid;
   print $pid $$;
 }
 
@@ -309,8 +309,7 @@ sub _spawn {
   # Prepare lock file
   my $c    = $self->{config};
   my $file = $c->{lock_file};
-  my $lock = IO::File->new("> $file")
-    or die qq/Can't open lock file "$file": $!/;
+  die qq/Can't open lock file "$file": $!/ unless open my $lock, '>', $file;
 
   # Change user/group
   my $loop = $self->{daemon}->setuidgid->ioloop;

diff --git a/lib/Mojo/Template.pm b/lib/Mojo/Template.pm
@@ -2,7 +2,7 @@ package Mojo::Template;
 use Mojo::Base -base;
 
 use Carp 'croak';
-use IO::File;
+use IO::Handle;
 use Mojo::ByteStream;
 use Mojo::Exception;
 use Mojo::Util qw/decode encode/;
@@ -309,8 +309,7 @@ sub render_file {
 
   # Slurp file
   $self->name($path) unless defined $self->{name};
-  croak qq/Can't open template "$path": $!/
-    unless my $file = IO::File->new("< $path");
+  croak qq/Can't open template "$path": $!/ unless open my $file, '<', $path;
   my $tmpl = '';
   while ($file->sysread(my $buffer, CHUNK_SIZE, 0)) { $tmpl .= $buffer }
 
@@ -361,8 +360,7 @@ sub _write_file {
   my ($self, $path, $output) = @_;
 
   # Encode and write to file
-  croak qq/Can't open file "$path": $!/
-    unless my $file = IO::File->new("> $path");
+  croak qq/Can't open file "$path": $!/ unless open my $file, '>', $path;
   $output = encode $self->encoding, $output if $self->encoding;
   croak qq/Can't write to file "$path": $!/
     unless defined $file->syswrite($output);

diff --git a/lib/Mojolicious/Plugin/PODRenderer.pm b/lib/Mojolicious/Plugin/PODRenderer.pm
@@ -1,7 +1,6 @@
 package Mojolicious::Plugin::PODRenderer;
 use Mojo::Base 'Mojolicious::Plugin';
 
-use IO::File;
 use Mojo::Asset::File;
 use Mojo::ByteStream 'b';
 use Mojo::DOM;
@@ -54,7 +53,7 @@ sub register {
         unless $path && -r $path;
 
       # Turn POD into HTML
-      my $file = IO::File->new("< $path");
+      open my $file, '<', $path;
       my $html = _pod_to_html(join '', <$file>);
 
       # Rewrite links

diff --git a/t/mojo/hypnotoad.t b/t/mojo/hypnotoad.t
@@ -11,7 +11,6 @@ use Test::More;
 use Cwd 'cwd';
 use File::Temp;
 use FindBin;
-use IO::File;
 use IO::Socket::INET;
 use Mojo::Command;
 use Mojo::IOLoop;
@@ -189,8 +188,7 @@ sleep 1
 chdir $cwd;
 
 sub _pid {
-  return
-    unless my $file = IO::File->new($command->rel_file('hypnotoad.pid'), '<');
+  return unless open my $file, '<', $command->rel_file('hypnotoad.pid');
   my $pid = <$file>;
   chomp $pid;
   return $pid;