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

chore(repl): update rustyline to 10.0.0 #15232

Merged
merged 3 commits into from
Jul 18, 2022
Merged

chore(repl): update rustyline to 10.0.0 #15232

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
0423dc1
chore(repl): update rustyline to 10.0.0
sigmaSd Jul 18, 2022
b72cfda
Merge branch 'main' into up_line
bartlomieju Jul 18, 2022
ad3b273
update nix dep
bartlomieju Jul 18, 2022
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
15 changes: 7 additions & 8 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ pin-project = "1.0.11" # don't pin because they yank crates from cargo
rand = { version = "=0.8.5", features = ["small_rng"] }
regex = "=1.5.6"
ring = "=0.16.20"
rustyline = { version = "=9.1.2", default-features = false }
rustyline-derive = "=0.6.0"
rustyline = { version = "=10.0.0", default-features = false, features = ["custom-bindings"] }
rustyline-derive = "=0.7.0"
secure_tempfile = { version = "=3.3.0", package = "tempfile" } # different name to discourage use in tests
semver-parser = "=0.10.2"
serde = { version = "=1.0.139", features = ["derive"] }
Expand Down Expand Up @@ -122,7 +122,7 @@ trust-dns-client = "=0.21.2"
trust-dns-server = "=0.21.2"

[target.'cfg(unix)'.dev-dependencies]
nix = "=0.23.0"
nix = "=0.24.2"

[package.metadata.winres]
# This section defines the metadata that appears in the deno.exe PE header.
Expand Down
3 changes: 2 additions & 1 deletion cli/tools/repl/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ impl ReplEditor {
.completion_type(CompletionType::List)
.build();

let mut editor = Editor::with_config(editor_config);
let mut editor =
Editor::with_config(editor_config).expect("Failed to create editor.");
editor.set_helper(Some(helper));
editor.load_history(&history_file_path).unwrap_or(());
editor.bind_sequence(
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ fwdansi = "1.1.0"
winapi = { version = "0.3.9", features = ["commapi", "knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] }

[target.'cfg(unix)'.dependencies]
nix = "=0.23.0"
nix = "=0.24.2"

[dev-dependencies]
# Used in benchmark
Expand Down