Bump some of our dependencies (#1234)

This commit is contained in:
Jonathan Turner 2020-01-18 09:35:48 +13:00 committed by GitHub
parent ba7a1752db
commit ba9cb753d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 495 additions and 108 deletions

566
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -59,7 +59,6 @@ nu_plugin_textview = {version = "0.8.0", path = "./crates/nu_plugin_textview", o
nu_plugin_tree = {version = "0.8.0", path = "./crates/nu_plugin_tree", optional=true}
nu-macros = { version = "0.8.0", path = "./crates/nu-macros" }
query_interface = "0.3.5"
typetag = "0.1.4"
rustyline = "5.0.6"
@ -70,18 +69,18 @@ itertools = "0.8.2"
ansi_term = "0.12.1"
nom = "5.0.1"
dunce = "1.0.0"
indexmap = { version = "1.3.0", features = ["serde-1"] }
indexmap = { version = "1.3.1", features = ["serde-1"] }
byte-unit = "3.0.3"
base64 = "0.11"
futures-preview = { version = "=0.3.0-alpha.19", features = ["compat", "io-compat"] }
async-stream = "0.1.2"
futures_codec = "0.2.5"
num-traits = "0.2.10"
num-traits = "0.2.11"
term = "0.5.2"
bytes = "0.4.12"
log = "0.4.8"
pretty_env_logger = "0.3.1"
serde = { version = "1.0.103", features = ["derive"] }
serde = { version = "1.0.104", features = ["derive"] }
bson = { version = "0.14.0", features = ["decimal128"] }
serde_json = "1.0.44"
serde-hjson = "0.9.1"
@ -91,13 +90,13 @@ getset = "0.0.9"
language-reporting = "0.4.0"
app_dirs = "1.2.1"
csv = "1.1"
toml = "0.5.5"
toml = "0.5.6"
clap = "2.33.0"
git2 = { version = "0.10.2", default_features = false }
git2 = { version = "0.11.0", default_features = false }
dirs = "2.0.2"
glob = "0.3.0"
ctrlc = "3.1.3"
roxmltree = "0.7.3"
roxmltree = "0.9.0"
nom_locate = "1.0.0"
nom-tracable = "0.4.1"
unicode-xid = "0.2.0"
@ -108,9 +107,9 @@ hex = "0.4"
tempfile = "3.1.0"
ichwh = "0.2"
textwrap = {version = "0.11.0", features = ["term_size"]}
shellexpand = "1.0.0"
shellexpand = "1.1.1"
pin-utils = "0.1.0-alpha.4"
num-bigint = { version = "0.2.3", features = ["serde"] }
num-bigint = { version = "0.2.5", features = ["serde"] }
bigdecimal = { version = "0.1.0", features = ["serde"] }
serde_urlencoded = "0.6.1"
trash = "1.0.0"
@ -120,20 +119,20 @@ strip-ansi-escapes = "0.1.0"
calamine = "0.16"
umask = "0.1"
futures-util = "0.3.1"
termcolor = "1.0.5"
termcolor = "1.1.0"
natural = "0.3.0"
parking_lot = "0.10.0"
clipboard = {version = "0.5", optional = true }
ptree = {version = "0.2" }
starship = { version = "0.28", optional = true}
starship = { version = "0.33.1", optional = true}
heim = {version = "0.0.9", optional = true}
battery = {version = "0.7.5", optional = true}
syntect = {version = "3.2.0", optional = true }
onig_sys = {version = "=69.1.0", optional = true }
crossterm = {version = "0.10.2", optional = true}
futures-timer = {version = "1.0.2", optional = true}
url = {version = "2.1.0", optional = true}
url = {version = "2.1.1", optional = true}
[target.'cfg(unix)'.dependencies]
users = "0.9"
@ -164,7 +163,7 @@ trace = ["nu-parser/trace"]
tree = ["nu_plugin_tree"]
[dependencies.rusqlite]
version = "0.20.0"
version = "0.21.0"
features = ["bundled", "blob"]
[dev-dependencies]
@ -172,8 +171,8 @@ pretty_assertions = "0.6.1"
nu-test-support = { version = "0.8.0", path = "./crates/nu-test-support" }
[build-dependencies]
toml = "0.5.5"
serde = { version = "1.0.103", features = ["derive"] }
toml = "0.5.6"
serde = { version = "1.0.104", features = ["derive"] }
nu-build = { version = "0.8.0", path = "./crates/nu-build" }
[lib]

View File

@ -8,10 +8,14 @@ use serde::Deserialize;
use serde::Serialize;
use std::path::{Path, PathBuf};
/// Anchors represent a location that a value originated from. The value may have been loaded from a file, fetched from a website, or parsed from some text
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum AnchorLocation {
/// The originating site where the value was first found
Url(String),
/// The original file where the value was loaded from
File(String),
/// The text where the value was parsed from
Source(Text),
}
@ -236,11 +240,14 @@ impl From<&std::ops::Range<usize>> for Span {
}
}
/// The set of metadata that can be associated with a value
#[derive(
Debug, Clone, PartialEq, Eq, Ord, PartialOrd, Serialize, Deserialize, Hash, Getters, new,
)]
pub struct Tag {
/// The original source for this value
pub anchor: Option<AnchorLocation>,
/// The span in the source text for the command that created this value
pub span: Span,
}

1
src/env/host.rs vendored
View File

@ -1,5 +1,4 @@
use crate::prelude::*;
use language_reporting::termcolor;
use nu_errors::ShellError;
use std::fmt::Debug;