chore(deps): Bump rustyline from 9.1.2 to 10.0.0 (#5139)

Bumps [rustyline](https://github.com/kkawakam/rustyline) from 9.1.2 to 10.0.0.
- [Release notes](https://github.com/kkawakam/rustyline/releases)
- [Changelog](https://github.com/kkawakam/rustyline/blob/master/History.md)
- [Commits](https://github.com/kkawakam/rustyline/compare/v9.1.2...v10.0.0)

---
updated-dependencies:
- dependency-name: rustyline
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
pull/24376/head
dependabot[bot] 2022-07-18 08:10:22 +00:00 committed by GitHub
parent fd2d262862
commit 1eeee9809c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 51 deletions

51
Cargo.lock generated
View File

@ -1415,12 +1415,6 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "endian-type"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
[[package]]
name = "errno"
version = "0.2.8"
@ -2996,28 +2990,6 @@ dependencies = [
"prost",
]
[[package]]
name = "nibble_vec"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
dependencies = [
"smallvec",
]
[[package]]
name = "nix"
version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
dependencies = [
"bitflags",
"cc",
"cfg-if",
"libc",
"memoffset",
]
[[package]]
name = "nix"
version = "0.24.2"
@ -3641,7 +3613,7 @@ dependencies = [
"inferno",
"libc",
"log",
"nix 0.24.2",
"nix",
"once_cell",
"parking_lot 0.12.1",
"prost",
@ -3982,16 +3954,6 @@ dependencies = [
"proc-macro2",
]
[[package]]
name = "radix_trie"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
dependencies = [
"endian-type",
"nibble_vec",
]
[[package]]
name = "rand"
version = "0.8.4"
@ -4461,9 +4423,9 @@ checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf"
[[package]]
name = "rustyline"
version = "9.1.2"
version = "10.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039"
checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e"
dependencies = [
"bitflags",
"cfg-if",
@ -4472,10 +4434,8 @@ dependencies = [
"libc",
"log",
"memchr",
"nix 0.23.1",
"radix_trie",
"nix",
"scopeguard",
"smallvec",
"unicode-segmentation",
"unicode-width",
"utf8parse",
@ -5245,7 +5205,7 @@ dependencies = [
"http",
"hyper",
"influxdb_iox_client",
"nix 0.24.2",
"nix",
"observability_deps",
"once_cell",
"parking_lot 0.12.1",
@ -6158,6 +6118,7 @@ dependencies = [
"log",
"md-5 0.10.1",
"memchr",
"nix",
"nom",
"num-integer",
"num-traits",

View File

@ -51,7 +51,7 @@ itertools = "0.10.1"
libc = { version = "0.2" }
num_cpus = "1.13.0"
once_cell = { version = "1.13.0", features = ["parking_lot"] }
rustyline = { version = "9.0", default-features = false }
rustyline = { version = "10.0", default-features = false }
serde_json = "1.0.82"
snafu = "0.7"
thiserror = "1.0.31"

View File

@ -50,7 +50,7 @@ pub async fn command(connection: Connection, config: Config) -> Result<()> {
println!("Connected to IOx Server");
let mut repl = repl::Repl::new(connection);
let mut repl = repl::Repl::new(connection).context(ReplSnafu)?;
repl.set_output_format(config.format).context(ReplSnafu)?;

View File

@ -45,6 +45,9 @@ pub enum Error {
#[snafu(display("Error running observer query: {}", source))]
RunningObserverQuery { source: super::observer::Error },
#[snafu(display("Cannot create REPL: {}", source))]
ReplCreation { source: ReadlineError },
}
pub type Result<T, E = Error> = std::result::Result<T, E>;
@ -172,11 +175,11 @@ impl Repl {
}
/// Create a new Repl instance, connected to the specified URL
pub fn new(connection: Connection) -> Self {
pub fn new(connection: Connection) -> Result<Self> {
let namespace_client = influxdb_iox_client::namespace::Client::new(connection.clone());
let flight_client = influxdb_iox_client::flight::Client::new(connection.clone());
let mut rl = Editor::new();
let mut rl = Editor::new().context(ReplCreationSnafu)?;
rl.set_helper(Some(RustylineHelper::default()));
let history_file = history_file();
@ -188,7 +191,7 @@ impl Repl {
let output_format = QueryOutputFormat::Pretty;
Self {
Ok(Self {
rl,
prompt,
connection,
@ -196,7 +199,7 @@ impl Repl {
flight_client,
query_engine: None,
output_format,
}
})
}
/// Read Evaluate Print Loop (interactive command line) for SQL

View File

@ -123,14 +123,17 @@ uuid = { version = "1", features = ["private_getrandom", "rng", "std", "v4"] }
[target.x86_64-unknown-linux-gnu.dependencies]
hyper-rustls = { version = "0.23", default-features = false, features = ["http1", "http2", "tls12", "tokio-runtime", "webpki-roots", "webpki-tokio"] }
nix = { version = "0.24", features = ["acct", "aio", "dir", "env", "event", "feature", "fs", "hostname", "inotify", "ioctl", "kmod", "memoffset", "mman", "mount", "mqueue", "net", "personality", "poll", "process", "pthread", "ptrace", "quota", "reboot", "resource", "sched", "signal", "socket", "term", "time", "ucontext", "uio", "user", "zerocopy"] }
tokio-util = { version = "0.7", default-features = false, features = ["io"] }
[target.x86_64-apple-darwin.dependencies]
hyper-rustls = { version = "0.23", default-features = false, features = ["http1", "http2", "tls12", "tokio-runtime", "webpki-roots", "webpki-tokio"] }
nix = { version = "0.24", features = ["acct", "aio", "dir", "env", "event", "feature", "fs", "hostname", "inotify", "ioctl", "kmod", "memoffset", "mman", "mount", "mqueue", "net", "personality", "poll", "process", "pthread", "ptrace", "quota", "reboot", "resource", "sched", "signal", "socket", "term", "time", "ucontext", "uio", "user", "zerocopy"] }
tokio-util = { version = "0.7", default-features = false, features = ["io"] }
[target.aarch64-apple-darwin.dependencies]
hyper-rustls = { version = "0.23", default-features = false, features = ["http1", "http2", "tls12", "tokio-runtime", "webpki-roots", "webpki-tokio"] }
nix = { version = "0.24", features = ["acct", "aio", "dir", "env", "event", "feature", "fs", "hostname", "inotify", "ioctl", "kmod", "memoffset", "mman", "mount", "mqueue", "net", "personality", "poll", "process", "pthread", "ptrace", "quota", "reboot", "resource", "sched", "signal", "socket", "term", "time", "ucontext", "uio", "user", "zerocopy"] }
tokio-util = { version = "0.7", default-features = false, features = ["io"] }
[target.x86_64-pc-windows-msvc.dependencies]