build: updated and audit libflux dependencies (#4640)

influxdata · Apr 5, 2022 · 1d92ddf · 1d92ddf
1 parent 3306b26
commit 1d92ddf
Show file tree

Hide file tree

Showing 11 changed files with 120 additions and 416 deletions.
diff --git a/libflux/Cargo.lock b/libflux/Cargo.lock
diff --git a/libflux/flux-core/Cargo.toml b/libflux/flux-core/Cargo.toml
@@ -23,48 +23,46 @@ bench = false
 default = ["strict"]
 strict = []
 lsp = ["lsp-types"]
-doc = ["rayon"]
+doc = ["csv", "once_cell", "pad", "pulldown-cmark", "rayon", "tempfile"]
 
 [dependencies]
-anyhow = "1"
-ena = "0.14"
-env_logger = "0.9"
-thiserror = "1"
+anyhow = "1.0.56"
+chrono = { version = "0.4", features = ["serde"] }
 codespan-reporting = "0.11"
-comrak = "0.10.1"
-fnv = "1.0.7"
-derive_more = { version = "0.99.11", default-features = false, features = [
+csv = { version = "1.1", optional = true }
+derivative = "2.1.1"
+derive_more = { version = "0.99.17", default-features = false, features = [
     "display"
 ] }
+ena = "0.14"
+env_logger = "0.9"
+flatbuffers = "2.1.1"
+fnv = "1.0.7"
+libflate = "1.2.0"
+log = "0.4.16"
+lsp-types = { version = "0.92", optional = true }
+maplit = "1.0.2"
+once_cell = { version = "1.10.0", optional = true }
+pad = { version = "0.1.6", optional = true }
+pulldown-cmark = { version = "0.9.0", default-features = false, optional = true }
 pretty = "0.11.2"
 rayon = { version = "1", optional = true }
-serde = { version = "^1.0.59", features = ["rc"] }
-serde_derive = "^1.0.59"
-serde_json = "1.0"
-serde-aux = "0.6.1"
-wasm-bindgen = { version = "0.2.62", features = ["serde-serialize"] }
-chrono = { version = "0.4", features = ["serde"] }
-regex = "1"
-maplit = "1.0.2"
-flatbuffers = "2.0.0"
-derivative = "2.1.1"
+regex = "1.5.5"
+serde = { version = "^1.0.136", features = ["rc"] }
+serde-aux = "3.0.1"
+serde_derive = "^1.0.136"
+serde_json = "1.0.79"
+structopt = "0.3.26"
+thiserror = "1"
+tempfile = { version = "3.3.0", optional = true }
 walkdir = "2.2.9"
-log = "0.4"
-lsp-types = { version = "0.92", optional = true }
-pulldown-cmark = { version = "0.8", default-features = false }
-structopt = "0.3"
-libflate = "1"
-once_cell = "1"
-csv = "1.1"
-pad = "0.1.6"
-tempfile = "3"
 
 [dev-dependencies]
-env_logger = "0.9"
-colored = "1.8"
-pretty_assertions = "1"
+colored = "2.0"
 criterion = "0.3.3"
-expect-test = "1.1.0"
+env_logger = "0.9"
+expect-test = "1.2.2"
+pretty_assertions = "1.2.1"
 
 [[bench]]
 name = "scanner"

diff --git a/libflux/flux-core/src/ast/flatbuffers/tests.rs b/libflux/flux-core/src/ast/flatbuffers/tests.rs
@@ -1,6 +1,3 @@
-extern crate flatbuffers;
-extern crate walkdir;
-
 use anyhow::{anyhow, Result};
 use chrono::FixedOffset;
 

diff --git a/libflux/flux-core/src/doc/mod.rs b/libflux/flux-core/src/doc/mod.rs
@@ -12,7 +12,7 @@ use std::{
 use anyhow::{bail, Result};
 use derive_more::Display;
 use once_cell::sync::Lazy;
-use pulldown_cmark::{Event, OffsetIter, Parser as MarkdownParser, Tag};
+use pulldown_cmark::{Event, HeadingLevel, OffsetIter, Parser as MarkdownParser, Tag};
 use regex::Regex;
 
 use crate::{
@@ -773,7 +773,7 @@ const METADATA_HEADING: &str = "Metadata";
 // Parser produces a series of tokens from documentation comments.
 struct Parser<'a> {
     content: &'a str,
-    iter: Peekable<OffsetIter<'a>>,
+    iter: Peekable<OffsetIter<'a, 'a>>,
     tokens: Vec<Token<'a>>,
 }
 
@@ -862,7 +862,7 @@ impl<'a> Parser<'a> {
         // Peek and consume items until we see a delimiter heading
         loop {
             match self.iter.next() {
-                Some((Event::Start(Tag::Heading(2)), r)) => {
+                Some((Event::Start(Tag::Heading(HeadingLevel::H2, _, _)), r)) => {
                     if let Some((Event::Text(t), _)) = self.iter.peek() {
                         // The description ends at the start of this heading
                         range.end = r.start;
@@ -897,7 +897,7 @@ impl<'a> Parser<'a> {
 
     fn parse_any_heading_or_description(&mut self) -> Result<()> {
         match self.iter.peek() {
-            Some((Event::Start(Tag::Heading(2)), _)) => {
+            Some((Event::Start(Tag::Heading(HeadingLevel::H2, _, _)), _)) => {
                 self.iter.next();
                 return self.parse_any_heading_text();
             }
@@ -931,7 +931,7 @@ impl<'a> Parser<'a> {
         }
         if let None = self
             .iter
-            .next_if(|e| matches!(e, (Event::End(Tag::Heading(2)), _)))
+            .next_if(|e| matches!(e, (Event::End(Tag::Heading(HeadingLevel::H2, _, _)), _)))
         {
             bail!("missing end of heading")
         }
@@ -1052,7 +1052,7 @@ impl<'a> Parser<'a> {
         }
         if let None = self
             .iter
-            .next_if(|e| matches!(e, (Event::End(Tag::Heading(2)), _)))
+            .next_if(|e| matches!(e, (Event::End(Tag::Heading(HeadingLevel::H2, _, _)), _)))
         {
             bail!("missing end of heading")
         }
@@ -1061,15 +1061,15 @@ impl<'a> Parser<'a> {
         let mut count = 0;
         loop {
             match self.iter.next() {
-                Some((Event::Start(Tag::Heading(2)), r)) => {
+                Some((Event::Start(Tag::Heading(HeadingLevel::H2, _, _)), r)) => {
                     // Heading 2 means we are done with examples
                     // We found the begining of a new section, emit the content token.
                     range.end = r.start;
                     self.tokens
                         .push(Token::ExampleContent(self.slice(range.clone())));
                     return self.parse_any_heading_text();
                 }
-                Some((Event::End(Tag::Heading(3)), r)) => {
+                Some((Event::End(Tag::Heading(HeadingLevel::H3, _, _)), r)) => {
                     range.end = r.start;
                     if count > 0 {
                         // We found another example emit the content token
@@ -1098,15 +1098,15 @@ impl<'a> Parser<'a> {
         }
         if let None = self
             .iter
-            .next_if(|e| matches!(e, (Event::End(Tag::Heading(2)), _)))
+            .next_if(|e| matches!(e, (Event::End(Tag::Heading(HeadingLevel::H2, _, _)), _)))
         {
             bail!("missing end of heading")
         }
         self.tokens.push(Token::Metadata);
         let mut range: Range<usize> = Range::default();
         loop {
             match self.iter.next() {
-                Some((Event::Start(Tag::Heading(2)), r)) => {
+                Some((Event::Start(Tag::Heading(HeadingLevel::H2, _, _)), r)) => {
                     // Heading 2 means we are done with metadata
                     // We found the begining of a new section, emit the line token.
                     range.end = r.start;

diff --git a/libflux/flux-core/src/lib.rs b/libflux/flux-core/src/lib.rs
@@ -15,15 +15,8 @@
 //!
 //! [Flux language]: https://github.com/influxdata/flux
 
-extern crate chrono;
-extern crate derive_more;
-extern crate fnv;
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_aux;
-#[macro_use]
-#[cfg(test)]
-extern crate pretty_assertions;
 
 // Only include the doc module if the feature is enabled.
 // The code has lots of dependencies we do not want as part of the crate by default.

diff --git a/libflux/flux-core/src/semantic/flatbuffers/mod.rs b/libflux/flux-core/src/semantic/flatbuffers/mod.rs
@@ -8,14 +8,12 @@ pub mod types;
 use std::{cell::RefCell, rc::Rc};
 
 use anyhow::{anyhow, bail, Error, Result};
+use chrono::Duration as ChronoDuration;
 use flatbuffers::{UnionWIPOffset, WIPOffset};
 use semantic_generated::fbsemantic;
 
 use crate::{ast, semantic, semantic::walk};
 
-extern crate chrono;
-use chrono::Duration as ChronoDuration;
-
 const UNKNOWNVARIANTNAME: &str = "UNKNOWNSEMANTIC";
 
 /// Serializes a [`semantic::nodes::Package`].

diff --git a/libflux/flux-core/src/semantic/flatbuffers/tests.rs b/libflux/flux-core/src/semantic/flatbuffers/tests.rs
@@ -1,6 +1,3 @@
-extern crate flatbuffers;
-extern crate walkdir;
-
 use anyhow::{anyhow, Result};
 use chrono::FixedOffset;
 

diff --git a/libflux/flux-core/src/semantic/nodes.rs b/libflux/flux-core/src/semantic/nodes.rs
@@ -7,9 +7,6 @@
 //  Uncommented node types are a direct port of the AST ones.
 #![allow(clippy::match_single_binding)]
 
-extern crate chrono;
-extern crate derivative;
-
 use std::{fmt::Debug, vec::Vec};
 
 use anyhow::{anyhow, bail, Result as AnyhowResult};

diff --git a/libflux/flux/Cargo.toml b/libflux/flux/Cargo.toml
@@ -11,27 +11,20 @@ crate-type = ["rlib", "staticlib", "cdylib"]
 [features]
 default = ["strict", "cffi"]
 strict = []
-cffi = []
+cffi = ["serde_json"]
 lsp = ["flux-core/lsp"]
 
 [dependencies]
-anyhow ="1"
-flux-core = { path = "../flux-core" }
+anyhow = "1"
 flatbuffers = "2.0.0"
-serde = "^1.0.59"
-serde_derive = "^1.0.59"
-serde_json = "1.0"
-serde-aux = "0.6.1"
-thiserror = "1"
+flux-core = { path = "../flux-core" }
 once_cell = "1"
+serde_json = { version = "1.0", optional = true }
+thiserror = "1"
 
 # `getrandom` is a dependency of the `tera` crate, which does not support
-# the wasm32-unknown-unknown target by default. Explicitly importing it here
-# allows us to enable that support with the "js" feature.
-# For details, see 'https://docs.rs/getrandom/0.2.3/getrandom/#webassembly-support'
-[dependencies.getrandom]
-version = "0.2"
-features = ["js"]
+# the wasm32-unknown-unknown target by default.
+getrandom = { version = "0.2.6", features = ["js"] }
 
 [dev-dependencies]
 criterion = "0.3.3"
@@ -40,13 +33,11 @@ maplit = "1.0.2"
 pretty_assertions = "1"
 
 [build-dependencies]
-flux-core = { path = "../flux-core" }
-serde_json = "1.0"
+anyhow = "1"
 flatbuffers = "2.0.0"
-anyhow ="1"
+flux-core = { path = "../flux-core" }
 walkdir = "2"
 
-
 [[bench]]
 name = "basic"
 harness = false

diff --git a/libflux/flux/src/lib.rs b/libflux/flux/src/lib.rs
@@ -3,15 +3,6 @@
 //! This module provides the public facing API for Flux's Go runtime, including formatting,
 //! parsing, and standard library analysis.
 
-extern crate fluxcore;
-extern crate serde_aux;
-
-extern crate serde_derive;
-
-#[cfg(test)]
-#[macro_use]
-extern crate pretty_assertions;
-
 use anyhow::anyhow;
 use fluxcore::semantic::env::Environment;
 use fluxcore::semantic::flatbuffers::semantic_generated::fbsemantic as fb;

diff --git a/libflux/go/libflux/buildinfo.gen.go b/libflux/go/libflux/buildinfo.gen.go
@@ -12,9 +12,9 @@ package libflux
 // are not tracked by Go's build system.'
 //lint:ignore U1000 generated code
 var sourceHashes = map[string]string{
-	"libflux/Cargo.lock":                                                                          "973599c0396be0d8f3d9aa8ce86a71e42b2741ad5fde5e285e777d1c940a03b7",
+	"libflux/Cargo.lock":                                                                          "283887171af621b35433dee0059a0f7baa97e14e7f250b626bf247b9787449eb",
 	"libflux/Cargo.toml":                                                                          "91ac4e8b467440c6e8a9438011de0e7b78c2732403bb067d4dd31539ac8a90c1",
-	"libflux/flux-core/Cargo.toml":                                                                "078a1acff05d2243db5bd3dd850395abf35f7bcd18c88f76fc7ac82226145743",
+	"libflux/flux-core/Cargo.toml":                                                                "77e7e2407a6efccd4008a352ee90fd5d53ad557599112e378d4e46ce1795169c",
 	"libflux/flux-core/src/ast/check/mod.rs":                                                      "47e06631f249715a44c9c8fa897faf142ad0fa26f67f8cfd5cd201e82cb1afc8",
 	"libflux/flux-core/src/ast/flatbuffers/ast_generated.rs":                                      "832e5d140b5eacd8c0c79c625e538a268a48e89a613cec84c9f22a7f93040352",
 	"libflux/flux-core/src/ast/flatbuffers/mod.rs":                                                "4e2d11d442ba3985024d5102c22c007dd9686f54cf942e79e5911c367fac7586",
@@ -25,10 +25,10 @@ var sourceHashes = map[string]string{
 	"libflux/flux-core/src/bin/fluxc.rs":                                                          "bf275289e690236988049fc0a07cf832dbac25bb5739c02135b069dcdfab4d0f",
 	"libflux/flux-core/src/bin/fluxdoc.rs":                                                        "bad4b12bcf4a8bc1a94cb37cda004bf7fb593abf3f0c6c3a2af6fabc60337c5d",
 	"libflux/flux-core/src/doc/example.rs":                                                        "6414756b3c74df1b58fdb739592e74ded3f89d85d647809333f72a3f6aad146f",
-	"libflux/flux-core/src/doc/mod.rs":                                                            "3a42d710039b9fa7c51116291b58040ffa84969e3036ee538a2e5f55666dae5e",
+	"libflux/flux-core/src/doc/mod.rs":                                                            "93c7b779078eb70bde4deabf333a714c4db2f283784880747a51a16216cdb5bd",
 	"libflux/flux-core/src/errors.rs":                                                             "5ee16ec2fd281f7c115ba0b7bcf3380749f64b7a282eb0fab7e6afe9858f3d4d",
 	"libflux/flux-core/src/formatter/mod.rs":                                                      "3d26f82f929e4a1f1c188b96b2a8a8c5e2a2fb8f0338fcfebaceead47cd2c4ef",
-	"libflux/flux-core/src/lib.rs":                                                                "153f4b1d98494f5cab6e46cb2492c217e3dfec1e14368b251a8b48e9c2838fff",
+	"libflux/flux-core/src/lib.rs":                                                                "443aed16dd600eecc1ffbee2d2dead6788e796cd5a278eb5dafb123843b8959e",
 	"libflux/flux-core/src/map.rs":                                                                "342c1cc111d343f01b97f38be10a9f1097bdd57cdc56f55e92fd3ed5028e6973",
 	"libflux/flux-core/src/parser/mod.rs":                                                         "724329a1212c78540c5483b40215a359e6ad8b5e7595547be9eabb468873506e",
 	"libflux/flux-core/src/parser/strconv.rs":                                                     "09b6089d3293d7722c2dbf94e3fb0146b3c056fb2803c2bcb3cda343b2849667",
@@ -42,7 +42,7 @@ var sourceHashes = map[string]string{
 	"libflux/flux-core/src/semantic/check.rs":                                                     "d0228a0a8176a5360d88cfe48acb1ffd036817b6aaadfadb94af446492603305",
 	"libflux/flux-core/src/semantic/convert.rs":                                                   "e6d4d01d887434b73dc2663eeb88294b67a64d15ffed7fb61af0e401fb5670ea",
 	"libflux/flux-core/src/semantic/env.rs":                                                       "db424704eece030a76dee968c3d1959e94d21b7f7400c35f8e233cb3089218a4",
-	"libflux/flux-core/src/semantic/flatbuffers/mod.rs":                                           "89007a9f09e42f3a096d1a028275734ec2b82906c308e37dfd783c99f2a43e81",
+	"libflux/flux-core/src/semantic/flatbuffers/mod.rs":                                           "a259b3c3b80cb6c19a38877df27d999f82e286629c132fd8abed5f95da5ee95f",
 	"libflux/flux-core/src/semantic/flatbuffers/semantic_generated.rs":                            "0f54e652b45b1515c71160a555200a062f9c3c5a681a14f7a0ac36cc19dd4e6f",
 	"libflux/flux-core/src/semantic/flatbuffers/types.rs":                                         "3b03937ab3b84746e0a242be659409827eba63b687a72d145c6455067468c374",
 	"libflux/flux-core/src/semantic/formatter/mod.rs":                                             "112f3cbf7023356cf8afc8a00c89584102c6b0745f55d426c9e2c187fbff159e",
@@ -51,19 +51,19 @@ var sourceHashes = map[string]string{
 	"libflux/flux-core/src/semantic/import.rs":                                                    "73adc35c735c317af0fa7625e77a58f6824667d8e59f35c7d05687bd02d79a84",
 	"libflux/flux-core/src/semantic/infer.rs":                                                     "4f51f0d551ea2ef7e26c3447e18f36de3ecdcc4bf0dffa7da724178bc00c7e5c",
 	"libflux/flux-core/src/semantic/mod.rs":                                                       "bffa695c1f78464e705281054993775f96708b582de57136c8dde6d257f0bdde",
-	"libflux/flux-core/src/semantic/nodes.rs":                                                     "9aeebae7d7c0bcf25ead8244bdb9cbc6f3104871c0d0d6c9dca1caea3c34368b",
+	"libflux/flux-core/src/semantic/nodes.rs":                                                     "7b2bde881bf36b10fd2e094c654d1c182eb9cda30e22074e0993334092ead1f0",
 	"libflux/flux-core/src/semantic/sub.rs":                                                       "362460a981f4dbcf73e1fd740301d5dd07b9f476604ca9c841259da2b03f8606",
 	"libflux/flux-core/src/semantic/types.rs":                                                     "e1072fe9acf33a957ed50952d25c5b532f75dcda739e3571fc0f020cfc119110",
 	"libflux/flux-core/src/semantic/vectorize.rs":                                                 "3ae8fca80dc298eb1e8fe1ec75410a31ea38d31d6db71d32bc6e9f51ea949a60",
 	"libflux/flux-core/src/semantic/walk/_walk.rs":                                                "198e6c546f73f78b1de4b963084033a06a6d71e72b0294b16c5e4de874f97a38",
 	"libflux/flux-core/src/semantic/walk/mod.rs":                                                  "8f6bcfc7d309ad821016d6622b49cfde3de5de4d7d0315e55c5cd7cfed279eb8",
 	"libflux/flux-core/src/semantic/walk/test_utils.rs":                                           "b980587707038c420d16b99f99587e69b71f02c32277db37c7e4a094d32f2b38",
 	"libflux/flux-core/src/semantic/walk/walk_mut.rs":                                             "4ef980dd4e64a4522d1d79d7bb72f5e3743c3e092387d46c8295d9364b5e2c12",
-	"libflux/flux/Cargo.toml":                                                                     "f9f73d9176225e75b2bf658dce4b1e4294db8a451b96ba28323afad4840cd54b",
+	"libflux/flux/Cargo.toml":                                                                     "0a703f6e931938a15e444885f297d385edb92e89b26bd57daac49521532ce7aa",
 	"libflux/flux/FLUXDOC.md":                                                                     "92e6dd8043bd87b4924e09aa28fb5346630aee1214de28ea2c8fc0687cad0785",
 	"libflux/flux/build.rs":                                                                       "eea9cfad417042bdd0908c5f7bcf2f004ee70031d973292e2cf54fab526a1807",
 	"libflux/flux/src/cffi.rs":                                                                    "3141641d1f4a946d3bca4cd4bf5044fcaeed037293bf16fb45219130284477d2",
-	"libflux/flux/src/lib.rs":                                                                     "a1a0d74bf8c7f7d250c37b4442d7e1552f20cb11dc4921217958a885e42d3d5f",
+	"libflux/flux/src/lib.rs":                                                                     "f2f6fca479115a87f3cdf8e56610edee3f4e93ae0a3fe02979900183552dcda4",
 	"libflux/flux/templates/base.html":                                                            "a818747b9621828bb96b94291c60922db54052bbe35d5e354f8e589d2a4ebd02",
 	"libflux/flux/templates/home.html":                                                            "f9927514dd42ca7271b4817ad1ca33ec79c03a77a783581b4dcafabd246ebf3f",
 	"libflux/flux/templates/package.html":                                                         "635e1d638ad1a430f3894ff0a458572ca3c4dc6b9cec2c57fe771443849e1402",