Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove logging from wit deps #7233

Merged
merged 3 commits into from
Oct 12, 2023
Merged

remove logging from wit deps #7233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9926ba5
wit: delete wasi logging package
Oct 12, 2023
de93a4f
command extended: use include keyword, delete import of logging
Oct 12, 2023
81734be
sync http wit definitions
Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions crates/wasi-http/wit/command-extended.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,6 @@
// All of the same imports and exports available in the wasi:cli/command world
// with addition of HTTP proxy related imports:
world command-extended {
import wasi:clocks/wall-clock;
import wasi:clocks/monotonic-clock;
import wasi:clocks/timezone;
import wasi:filesystem/types;
import wasi:filesystem/preopens;
import wasi:sockets/instance-network;
import wasi:sockets/ip-name-lookup;
import wasi:sockets/network;
import wasi:sockets/tcp-create-socket;
import wasi:sockets/tcp;
import wasi:sockets/udp-create-socket;
import wasi:sockets/udp;
import wasi:random/random;
import wasi:random/insecure;
import wasi:random/insecure-seed;
import wasi:io/poll;
import wasi:io/streams;
import wasi:cli/environment;
import wasi:cli/exit;
import wasi:cli/stdin;
import wasi:cli/stdout;
import wasi:cli/stderr;
import wasi:cli/terminal-input;
import wasi:cli/terminal-output;
import wasi:cli/terminal-stdin;
import wasi:cli/terminal-stdout;
import wasi:cli/terminal-stderr;

// We should replace all others with `include self.command`
// as soon as the unioning of worlds is available:
// https://github.com/WebAssembly/component-model/issues/169
import wasi:logging/logging;
include wasi:cli/command;
import wasi:http/outgoing-handler;
}
37 changes: 0 additions & 37 deletions crates/wasi-http/wit/deps/logging/logging.wit
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions crates/wasi-http/wit/deps/logging/world.wit
View file
Open in desktop

This file was deleted.

33 changes: 1 addition & 32 deletions crates/wasi/wit/command-extended.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,6 @@
// All of the same imports and exports available in the wasi:cli/command world
// with addition of HTTP proxy related imports:
world command-extended {
import wasi:clocks/wall-clock;
import wasi:clocks/monotonic-clock;
import wasi:clocks/timezone;
import wasi:filesystem/types;
import wasi:filesystem/preopens;
import wasi:sockets/instance-network;
import wasi:sockets/ip-name-lookup;
import wasi:sockets/network;
import wasi:sockets/tcp-create-socket;
import wasi:sockets/tcp;
import wasi:sockets/udp-create-socket;
import wasi:sockets/udp;
import wasi:random/random;
import wasi:random/insecure;
import wasi:random/insecure-seed;
import wasi:io/poll;
import wasi:io/streams;
import wasi:cli/environment;
import wasi:cli/exit;
import wasi:cli/stdin;
import wasi:cli/stdout;
import wasi:cli/stderr;
import wasi:cli/terminal-input;
import wasi:cli/terminal-output;
import wasi:cli/terminal-stdin;
import wasi:cli/terminal-stdout;
import wasi:cli/terminal-stderr;

// We should replace all others with `include self.command`
// as soon as the unioning of worlds is available:
// https://github.com/WebAssembly/component-model/issues/169
import wasi:logging/logging;
include wasi:cli/command;
import wasi:http/outgoing-handler;
}
37 changes: 0 additions & 37 deletions crates/wasi/wit/deps/logging/logging.wit
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions crates/wasi/wit/deps/logging/world.wit
View file
Open in desktop

This file was deleted.