1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 23:34:47 -05:00
This commit is contained in:
Ryan Dahl 2018-08-30 13:54:56 -04:00
parent 2dd9a8d028
commit 0ec629d105
3 changed files with 9 additions and 9 deletions

2
js/fetch_types.d.ts vendored
View file

@ -145,7 +145,7 @@ interface File extends Blob {
declare var File: { declare var File: {
prototype: File; prototype: File;
new(fileBits: BlobPart[], fileName: string, options?: FilePropertyBag): File; new (fileBits: BlobPart[], fileName: string, options?: FilePropertyBag): File;
}; };
interface FilePropertyBag extends BlobPropertyBag { interface FilePropertyBag extends BlobPropertyBag {

View file

@ -187,7 +187,7 @@ export class FileInfo {
this.len = this._msg.len().toFloat64(); this.len = this._msg.len().toFloat64();
this.modified = this._msg.modified().toFloat64(); this.modified = this._msg.modified().toFloat64();
this.accessed = this._msg.accessed().toFloat64(); this.accessed = this._msg.accessed().toFloat64();
this.created = created ? created: null; this.created = created ? created : null;
} }
isFile() { isFile() {

View file

@ -14,8 +14,8 @@ use hyper::Client;
use msg_generated::deno as msg; use msg_generated::deno as msg;
use std; use std;
use std::fs; use std::fs;
use std::time::UNIX_EPOCH;
use std::path::Path; use std::path::Path;
use std::time::UNIX_EPOCH;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use tokio::prelude::future; use tokio::prelude::future;
use tokio::prelude::*; use tokio::prelude::*;
@ -479,12 +479,12 @@ macro_rules! to_seconds {
($time:expr) => {{ ($time:expr) => {{
// Unwrap is safe here as if the file is before the unix epoch // Unwrap is safe here as if the file is before the unix epoch
// something is very wrong. // something is very wrong.
$time.and_then(|t| Ok(t.duration_since(UNIX_EPOCH).unwrap().as_secs())) $time
.unwrap_or(0) .and_then(|t| Ok(t.duration_since(UNIX_EPOCH).unwrap().as_secs()))
}} .unwrap_or(0)
}};
} }
fn handle_stat_sync( fn handle_stat_sync(
_d: *const DenoC, _d: *const DenoC,
builder: &mut FlatBufferBuilder, builder: &mut FlatBufferBuilder,
@ -494,9 +494,9 @@ fn handle_stat_sync(
debug!("handle_stat_sync {} {}", filename, lstat); debug!("handle_stat_sync {} {}", filename, lstat);
let path = Path::new(filename); let path = Path::new(filename);
let metadata = if lstat { let metadata = if lstat {
fs::symlink_metadata(path)? fs::symlink_metadata(path)?
} else { } else {
fs::metadata(path)? fs::metadata(path)?
}; };
let msg = msg::StatSyncRes::create( let msg = msg::StatSyncRes::create(