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.

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

Bump deps to use newly published ones #1485

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,182 changes: 689 additions & 493 deletions Cargo.lock

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,13 @@ heck = "0.5.0"

[dependencies]
edgeql-parser = {git = "https://github.com/edgedb/edgeql"}
gel-protocol = {git = "https://github.com/edgedb/edgedb-rust/", features=["all-types"]}
gel-derive = {git = "https://github.com/edgedb/edgedb-rust/"}
gel-errors = {git = "https://github.com/edgedb/edgedb-rust/"}
gel-tokio = {git = "https://github.com/edgedb/edgedb-rust/", features=["admin_socket", "unstable"]}

# Use cargo update for these
gel-protocol = { version = "0", features = ["all-types"] }
gel-derive = { version = "0" }
gel-errors = { version = "0" }
gel-tokio = { version = "0", features=["admin_socket", "unstable"] }

snafu = "0.8.4"
ansi-escapes = "0.2"
anyhow = "1.0.23"
Expand Down Expand Up @@ -75,7 +78,6 @@ prettytable-rs = {version="0.10.0", default-features=false}
tempfile = "3.1.0"
codespan-reporting = "0.11"
termcolor = "1.1.0"
async-listen = "0.2.0"
sha1 = "0.10.1"
hex = {version="0.4.3", features=["serde"]}
textwrap = "0.16.0"
Expand Down Expand Up @@ -112,7 +114,6 @@ minimad = "0.13.1"
edgedb-cli-derive = { path="edgedb-cli-derive" }
fs-err = "3.1.0"
pem = "3.0.3"
rustls = { version = "0.23", features = ["ring"], default-features = false }
tokio-stream = "0.1.11"
futures-util = "0.3.15" # used for signals
concolor = { version = "0.1.1", features = ["auto"] }
Expand Down Expand Up @@ -141,6 +142,7 @@ anes = "0.2.0"
geozero = {version="0.14.0", features=["with-wkb"]}
terminal-light = "1.7.0"
globset = "0.4.15"
x509-parser = "0.17.0"

[dependencies.bzip2]
version = "*"
Expand All @@ -152,11 +154,11 @@ predicates = "3.1.2"
pretty_assertions = "1.2.0"
shutdown_hooks = "0.1.0"
test-case = "3.3.0"
openssl = "0.10.30"
tokio = {version="1.1.0", features=["rt-multi-thread"]}
warp = {git="https://github.com/seanmonstar/warp.git", rev="7b07043cee0ca24e912155db4e8f6d9ab7c049ed", default-features=false, features=["tls"]}
warp = {version="0.3.1", default-features=false, features=["tls"]}
fs_extra = "1.3.0"
test-utils = {git="https://github.com/edgedb/test-utils.git"}
openssl = "0.10.71"

[build-dependencies]
serde_json = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ pub struct ConnectionOptions {
#[arg(long, hide=true, help_heading=Some(CONN_OPTIONS_GROUP))]
#[arg(value_name = "insecure | no_host_verification | strict | default")]
#[arg(global = true)]
tls_security: Option<String>,
pub tls_security: Option<String>,

/// Override server name used for TLS connections and certificate
/// verification.
Expand Down Expand Up @@ -878,7 +878,7 @@ impl Options {
);
}
let sock = runstate_dir(name)?.join(format!(".s.EDGEDB.admin.{port}"));
cfg = cfg.with_unix_path(&sock);
cfg = cfg.with_unix_path(&sock)?;
}
(true, Some(_), None) => {
anyhow::bail!(
Expand Down
Loading
Loading