From 8523ce3d01f41559da4b974c30e69544664bf2fb Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Sun, 1 Sep 2019 21:56:17 +0200 Subject: [PATCH] Get rid of feature(crate_visibility_modifier) (see #362) --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- src/commands/command.rs | 6 +++--- src/lib.rs | 1 - src/parser/hir.rs | 6 +++--- src/parser/hir/binary.rs | 2 +- src/parser/hir/external_command.rs | 2 +- src/parser/hir/path.rs | 2 +- src/parser/parse/call_node.rs | 4 ++-- src/parser/parse/flag.rs | 2 +- src/parser/parse/pipeline.rs | 2 +- src/parser/parse/token_tree.rs | 4 ++-- 12 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 97a039f9c..651e08351 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -870,12 +870,12 @@ dependencies = [ [[package]] name = "getset" -version = "0.0.7" +version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1578,7 +1578,7 @@ dependencies = [ "futures-preview 0.3.0-alpha.18 (registry+https://github.com/rust-lang/crates.io-index)", "futures-timer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures_codec 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "getset 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "getset 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "git2 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "heim 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3214,7 +3214,7 @@ dependencies = [ "checksum futures-util-preview 0.3.0-alpha.18 (registry+https://github.com/rust-lang/crates.io-index)" = "7df53daff1e98cc024bf2720f3ceb0414d96fbb0a94f3cad3a5c3bf3be1d261c" "checksum futures_codec 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "36552cd31353fd135114510d53b8d120758120c36aa636a9341970f9efb1e4a0" "checksum getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49" -"checksum getset 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "19fbde0fad0c1c1f9474694b1f5c9ba22b09f2f74f74e6d2bd19c43f6656e2cb" +"checksum getset 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "117a5b13aecd4e10161bb3feb22dda898e8552836c2391d8e4645d5e703ab866" "checksum git2 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "327d698f86a7ebdfeb86a4238ccdb004828939d3a3555b6ead679541d14e36c0" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" diff --git a/Cargo.toml b/Cargo.toml index 49dcbad94..8aeeb0fb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ serde_json = "1.0.40" serde-hjson = "0.9.1" serde_yaml = "0.8" serde_bytes = "0.11.2" -getset = "0.0.7" +getset = "0.0.8" language-reporting = "0.3.1" app_dirs = "1.2.1" csv = "1.1" diff --git a/src/commands/command.rs b/src/commands/command.rs index 10611b41b..d0734ed71 100644 --- a/src/commands/command.rs +++ b/src/commands/command.rs @@ -97,7 +97,7 @@ impl CallInfo { } #[derive(Getters)] -#[get = "crate"] +#[get = "pub(crate)"] pub struct CommandArgs { pub host: Arc>, pub shell_manager: ShellManager, @@ -106,7 +106,7 @@ pub struct CommandArgs { } #[derive(Getters, Clone)] -#[get = "crate"] +#[get = "pub(crate)"] pub struct RawCommandArgs { pub host: Arc>, pub shell_manager: ShellManager, @@ -367,7 +367,7 @@ impl EvaluatedFilterCommandArgs { } #[derive(Getters, new)] -#[get = "crate"] +#[get = "pub(crate)"] pub struct EvaluatedCommandArgs { pub host: Arc>, pub shell_manager: ShellManager, diff --git a/src/lib.rs b/src/lib.rs index e1a068cde..15c06af71 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,3 @@ -#![feature(crate_visibility_modifier)] #![feature(generators)] #![feature(specialization)] #![feature(proc_macro_hygiene)] diff --git a/src/parser/hir.rs b/src/parser/hir.rs index 3f0ab2ce4..67b7ee8c8 100644 --- a/src/parser/hir.rs +++ b/src/parser/hir.rs @@ -38,11 +38,11 @@ pub fn path(head: impl Into, tail: Vec>>) - #[derive(Debug, Clone, Eq, PartialEq, Getters, Serialize, Deserialize, new)] pub struct Call { - #[get = "crate"] + #[get = "pub(crate)"] pub head: Box, - #[get = "crate"] + #[get = "pub(crate)"] pub positional: Option>, - #[get = "crate"] + #[get = "pub(crate)"] pub named: Option, } diff --git a/src/parser/hir/binary.rs b/src/parser/hir/binary.rs index 2dc11d19c..02a4d416e 100644 --- a/src/parser/hir/binary.rs +++ b/src/parser/hir/binary.rs @@ -9,7 +9,7 @@ use std::fmt; #[derive( Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Getters, Serialize, Deserialize, new, )] -#[get = "crate"] +#[get = "pub(crate)"] pub struct Binary { left: Expression, op: Tagged, diff --git a/src/parser/hir/external_command.rs b/src/parser/hir/external_command.rs index fab218f8d..8511cce1e 100644 --- a/src/parser/hir/external_command.rs +++ b/src/parser/hir/external_command.rs @@ -7,7 +7,7 @@ use std::fmt; #[derive( Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Getters, Serialize, Deserialize, new, )] -#[get = "crate"] +#[get = "pub(crate)"] pub struct ExternalCommand { name: Span, } diff --git a/src/parser/hir/path.rs b/src/parser/hir/path.rs index ef767d53f..f43edf176 100644 --- a/src/parser/hir/path.rs +++ b/src/parser/hir/path.rs @@ -9,7 +9,7 @@ use std::fmt; #[derive( Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Getters, Serialize, Deserialize, new, )] -#[get = "crate"] +#[get = "pub(crate)"] pub struct Path { head: Expression, tail: Vec>, diff --git a/src/parser/parse/call_node.rs b/src/parser/parse/call_node.rs index eab5c8f32..2869abb44 100644 --- a/src/parser/parse/call_node.rs +++ b/src/parser/parse/call_node.rs @@ -3,9 +3,9 @@ use getset::Getters; #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Getters)] pub struct CallNode { - #[get = "crate"] + #[get = "pub(crate)"] head: Box, - #[get = "crate"] + #[get = "pub(crate)"] children: Option>, } diff --git a/src/parser/parse/flag.rs b/src/parser/parse/flag.rs index a285a788c..096d69879 100644 --- a/src/parser/parse/flag.rs +++ b/src/parser/parse/flag.rs @@ -10,7 +10,7 @@ pub enum FlagKind { } #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Getters, new)] -#[get = "crate"] +#[get = "pub(crate)"] pub struct Flag { kind: FlagKind, name: Span, diff --git a/src/parser/parse/pipeline.rs b/src/parser/parse/pipeline.rs index 2d16b1d7a..20365bfbc 100644 --- a/src/parser/parse/pipeline.rs +++ b/src/parser/parse/pipeline.rs @@ -12,7 +12,7 @@ pub struct Pipeline { #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Getters, new)] pub struct PipelineElement { pub pre_ws: Option, - #[get = "crate"] + #[get = "pub(crate)"] call: Tagged, pub post_ws: Option, pub post_pipe: Option, diff --git a/src/parser/parse/token_tree.rs b/src/parser/parse/token_tree.rs index 8831c5263..3ecc597fd 100644 --- a/src/parser/parse/token_tree.rs +++ b/src/parser/parse/token_tree.rs @@ -177,7 +177,7 @@ impl TokenNode { } #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Getters, new)] -#[get = "crate"] +#[get = "pub(crate)"] pub struct DelimitedNode { delimiter: Delimiter, children: Vec, @@ -201,7 +201,7 @@ pub enum Delimiter { } #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Getters, new)] -#[get = "crate"] +#[get = "pub(crate)"] pub struct PathNode { head: Box, tail: Vec,