Skip to content

Commit

Permalink
Merge remote-tracking branch 'denoland/master' into filesystem8d
Browse files Browse the repository at this point in the history
* denoland/master:
  use Object instead of Map for promise table (denoland#4309)
  reorg: move js runtime tests to cli/js/tests/ (denoland#4250)
  upgrade: dprint 0.8.0 (denoland#4308)
  reorg: move JS ops implementations to cli/js/ops/, part 3 (denoland#4302)
  test: add actual error class to fail message (denoland#4305)
  upgrade: typescript 3.8.3 (denoland#4301)
  reorg: move JS ops implementations to cli/js/ops/, part 2 (denoland#4283)
  feat(std/node) add appendFile and appendFileSync (denoland#4294)
  disable test_raw_tty (denoland#4282)
  • Loading branch information
dubiousjim committed Mar 10, 2020
2 parents 72c0c40 + dca0021 commit 604b18e
Show file tree
Hide file tree
Showing 120 changed files with 1,173 additions and 421 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ byteorder = "1.3.4"
clap = "2.33.0"
dirs = "2.0.2"
dlopen = "0.1.8"
dprint-plugin-typescript = "0.7.0"
dprint-plugin-typescript = "0.8.0"
futures = { version = "0.3.4", features = [ "compat", "io-compat" ] }
glob = "0.3.0"
http = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion cli/js/compiler_host.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { ASSETS, MediaType, SourceFile } from "./compiler_sourcefile.ts";
import { OUT_DIR, WriteFileCallback, getAsset } from "./compiler_util.ts";
import { cwd } from "./dir.ts";
import { cwd } from "./ops/fs/dir.ts";
import { assert, notImplemented } from "./util.ts";
import * as util from "./util.ts";

Expand Down
2 changes: 1 addition & 1 deletion cli/js/compiler_imports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
SourceFileJson
} from "./compiler_sourcefile.ts";
import { normalizeString, CHAR_FORWARD_SLASH } from "./compiler_util.ts";
import { cwd } from "./dir.ts";
import { cwd } from "./ops/fs/dir.ts";
import { assert } from "./util.ts";
import * as util from "./util.ts";
import * as compilerOps from "./ops/compiler.ts";
Expand Down
47 changes: 19 additions & 28 deletions cli/js/deno.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ export {
writeAllSync
} from "./buffer.ts";
export { build, OperatingSystem, Arch } from "./build.ts";
export { chmodSync, chmod } from "./chmod.ts";
export { chownSync, chown } from "./chown.ts";
export { chmodSync, chmod } from "./ops/fs/chmod.ts";
export { chownSync, chown } from "./ops/fs/chown.ts";
export { transpileOnly, compile, bundle } from "./compiler_api.ts";
export { inspect } from "./console.ts";
export { copyFileSync, copyFile } from "./copy_file.ts";
export { copyFileSync, copyFile } from "./ops/fs/copy_file.ts";
export {
Diagnostic,
DiagnosticCategory,
DiagnosticItem,
DiagnosticMessageChain
} from "./diagnostics.ts";
export { chdir, cwd } from "./dir.ts";
export { chdir, cwd } from "./ops/fs/dir.ts";
export { applySourceMap, formatDiagnostics } from "./ops/errors.ts";
export { errors } from "./errors.ts";
export { FileInfo } from "./file_info.ts";
Expand All @@ -33,15 +33,12 @@ export {
stdin,
stdout,
stderr,
read,
readSync,
write,
writeSync,
seek,
seekSync,
OpenOptions,
OpenMode
} from "./files.ts";
export { read, readSync, write, writeSync } from "./ops/io.ts";
export { FsEvent, fsEvents } from "./ops/fs_events.ts";
export {
EOF,
Expand All @@ -62,16 +59,16 @@ export {
ReadWriteCloser,
ReadWriteSeeker
} from "./io.ts";
export { linkSync, link } from "./link.ts";
export { linkSync, link } from "./ops/fs/link.ts";
export {
makeTempDirSync,
makeTempDir,
makeTempFileSync,
makeTempFile,
MakeTempOptions
} from "./make_temp.ts";
} from "./ops/fs/make_temp.ts";
export { metrics, Metrics } from "./ops/runtime.ts";
export { mkdirSync, mkdir, MkdirOptions } from "./mkdir.ts";
export { mkdirSync, mkdir, MkdirOptions } from "./ops/fs/mkdir.ts";
export {
Addr,
connect,
Expand Down Expand Up @@ -101,28 +98,22 @@ export {
Permissions
} from "./permissions.ts";
export { openPlugin } from "./plugins.ts";
export {
kill,
run,
RunOptions,
Process,
ProcessStatus,
Signal
} from "./process.ts";
export { readdirSync, readdir } from "./read_dir.ts";
export { kill } from "./ops/process.ts";
export { run, RunOptions, Process, ProcessStatus, Signal } from "./process.ts";
export { readdirSync, readdir } from "./ops/fs/read_dir.ts";
export { readFileSync, readFile } from "./read_file.ts";
export { readlinkSync, readlink } from "./read_link.ts";
export { realpathSync, realpath } from "./realpath.ts";
export { removeSync, remove, RemoveOptions } from "./remove.ts";
export { renameSync, rename } from "./rename.ts";
export { readlinkSync, readlink } from "./ops/fs/read_link.ts";
export { realpathSync, realpath } from "./ops/fs/realpath.ts";
export { removeSync, remove, RemoveOptions } from "./ops/fs/remove.ts";
export { renameSync, rename } from "./ops/fs/rename.ts";
export { resources, close } from "./ops/resources.ts";
export { signal, signals, SignalStream } from "./signals.ts";
export { statSync, lstatSync, stat, lstat } from "./stat.ts";
export { symlinkSync, symlink } from "./symlink.ts";
export { statSync, lstatSync, stat, lstat } from "./ops/fs/stat.ts";
export { symlinkSync, symlink } from "./ops/fs/symlink.ts";
export { connectTLS, listenTLS } from "./tls.ts";
export { truncateSync, truncate } from "./truncate.ts";
export { truncateSync, truncate } from "./ops/fs/truncate.ts";
export { isatty, setRaw } from "./ops/tty.ts";
export { utimeSync, utime } from "./utime.ts";
export { utimeSync, utime } from "./ops/fs/utime.ts";
export { version } from "./version.ts";
export { writeFileSync, writeFile, WriteFileOptions } from "./write_file.ts";
export const args: string[] = [];
Expand Down
2 changes: 1 addition & 1 deletion cli/js/file_info.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { StatResponse } from "./stat.ts";
import { StatResponse } from "./ops/fs/stat.ts";
import { build } from "./build.ts";

/** A FileInfo describes a file and is returned by `stat`, `lstat`,
Expand Down
Loading

0 comments on commit 604b18e

Please sign in to comment.