diff options
| -rw-r--r-- | cli/msg.fbs | 1 | ||||
| -rw-r--r-- | cli/ops.rs | 5 | ||||
| -rw-r--r-- | js/file_info.ts | 8 | ||||
| -rw-r--r-- | js/read_dir_test.ts | 7 |
4 files changed, 1 insertions, 20 deletions
diff --git a/cli/msg.fbs b/cli/msg.fbs index 493bf1d68..6efa871b6 100644 --- a/cli/msg.fbs +++ b/cli/msg.fbs @@ -435,7 +435,6 @@ table StatRes { mode: uint; has_mode: bool; // false on windows name: string; - path: string; } table Truncate { diff --git a/cli/ops.rs b/cli/ops.rs index 07def46e8..023662c20 100644 --- a/cli/ops.rs +++ b/cli/ops.rs @@ -1284,8 +1284,6 @@ fn op_stat( fs::metadata(&filename)? }; - let filename_str = builder.create_string(&filename_); - let inner = msg::StatRes::create( builder, &msg::StatResArgs { @@ -1297,7 +1295,6 @@ fn op_stat( created: to_seconds!(metadata.created()), mode: get_mode(&metadata.permissions()), has_mode: cfg!(target_family = "unix"), - path: Some(filename_str), ..Default::default() }, ); @@ -1340,7 +1337,6 @@ fn op_read_dir( let metadata = entry.metadata().unwrap(); let file_type = metadata.file_type(); let name = builder.create_string(entry.file_name().to_str().unwrap()); - let path = builder.create_string(entry.path().to_str().unwrap()); msg::StatRes::create( builder, @@ -1352,7 +1348,6 @@ fn op_read_dir( accessed: to_seconds!(metadata.accessed()), created: to_seconds!(metadata.created()), name: Some(name), - path: Some(path), mode: get_mode(&metadata.permissions()), has_mode: cfg!(target_family = "unix"), }, diff --git a/js/file_info.ts b/js/file_info.ts index 0026d22c8..f2e5a88ae 100644 --- a/js/file_info.ts +++ b/js/file_info.ts @@ -27,12 +27,9 @@ export interface FileInfo { */ mode: number | null; - /** Returns the file or directory name. */ + /** The file or directory name. */ name: string | null; - /** Returns the file or directory path. */ - path: string | null; - /** Returns whether this is info for a regular file. This result is mutually * exclusive to `FileInfo.isDirectory` and `FileInfo.isSymlink`. */ @@ -59,7 +56,6 @@ export class FileInfoImpl implements FileInfo { created: number | null; mode: number | null; name: string | null; - path: string | null; /* @internal */ constructor(private _inner: msg.StatRes) { @@ -69,7 +65,6 @@ export class FileInfoImpl implements FileInfo { const hasMode = this._inner.hasMode(); const mode = this._inner.mode(); // negative for invalid mode (Windows) const name = this._inner.name(); - const path = this._inner.path(); this._isFile = this._inner.isFile(); this._isSymlink = this._inner.isSymlink(); @@ -80,7 +75,6 @@ export class FileInfoImpl implements FileInfo { // null on Windows this.mode = hasMode ? mode : null; this.name = name ? name : null; - this.path = path ? path : null; } isFile(): boolean { diff --git a/js/read_dir_test.ts b/js/read_dir_test.ts index 55badd0db..3e11df9fe 100644 --- a/js/read_dir_test.ts +++ b/js/read_dir_test.ts @@ -3,8 +3,6 @@ import { testPerm, assert, assertEquals } from "./test_util.ts"; type FileInfo = Deno.FileInfo; -const isWin = Deno.build.os === "win"; - function assertSameContent(files: FileInfo[]): void { let counter = 0; @@ -15,11 +13,6 @@ function assertSameContent(files: FileInfo[]): void { } if (file.name === "002_hello.ts") { - if (isWin) { - assert(file.path.endsWith(`tests\\${file.name}`)); - } else { - assert(file.path.endsWith(`tests/${file.name}`)); - } assertEquals(file.mode!, Deno.statSync(`tests/${file.name}`).mode!); counter++; } |