extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-12-22 15:13:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Trim trailing whitespace and set it in editorconfig

Browse Source
This commit is contained in:
est31 2019-09-03 02:49:51 +02:00
parent 3d912a2c1d
commit cf0efb811e
10 changed files with 149 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -4,6 +4,6 @@ root = true
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
charset = utf-8 charset = utf-8
trim_trailing_whitespace = false trim_trailing_whitespace = true
insert_final_newline = false insert_final_newline = false
end_of_line = lf end_of_line = lf

2
src/object/dict.rs
View File

@ -146,7 +146,7 @@ impl TaggedDictBuilder {
dict: IndexMap::default(), dict: IndexMap::default(),
} }
} }
pub fn with_capacity(tag: impl Into<Tag>, n: usize) -> TaggedDictBuilder { pub fn with_capacity(tag: impl Into<Tag>, n: usize) -> TaggedDictBuilder {
TaggedDictBuilder { TaggedDictBuilder {
tag: tag.into(), tag: tag.into(),

4
src/parser/deserializer.rs
View File

@ -58,7 +58,7 @@ impl<'de> ConfigDeserializer<'de> {
Ok(()) Ok(())
} }
pub fn top(&mut self) -> &DeserializerItem { pub fn top(&mut self) -> &DeserializerItem {
let value = self.stack.last(); let value = self.stack.last();
trace!("inspecting top value :: {:?}", value); trace!("inspecting top value :: {:?}", value);
@ -191,7 +191,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
{ {
unimplemented!("deserialize_byte_buf") unimplemented!("deserialize_byte_buf")
} }
fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, Self::Error> fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, Self::Error>
where where
V: Visitor<'de>, V: Visitor<'de>,

2
tests/command_cp_tests.rs
View File

@ -104,7 +104,7 @@ fn deep_copies_with_recursive_flag() {
let yehudas_expected_copied_dir = expected_dir.join("contributors").join("yehuda"); let yehudas_expected_copied_dir = expected_dir.join("contributors").join("yehuda");
nu!( nu!(
cwd: dirs.test(), cwd: dirs.test(),
"cp originals expected --recursive" "cp originals expected --recursive"
); );

42
tests/command_ls_tests.rs
View File

@ -16,13 +16,13 @@ fn ls_lists_regular_files() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
ls ls
| get name | get name
| lines | lines
| split-column "." | split-column "."
| get Column2 | get Column2
| str --to-int | str --to-int
| sum | sum
| echo $it | echo $it
"# "#
)); ));
@ -45,13 +45,13 @@ fn ls_lists_regular_files_using_asterisk_wildcard() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
ls *.txt ls *.txt
| get name | get name
| lines | lines
| split-column "." | split-column "."
| get Column2 | get Column2
| str --to-int | str --to-int
| sum | sum
| echo $it | echo $it
"# "#
)); ));
@ -74,13 +74,13 @@ fn ls_lists_regular_files_using_question_mark_wildcard() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
ls *.??.txt ls *.??.txt
| get name | get name
| lines | lines
| split-column "." | split-column "."
| get Column2 | get Column2
| str --to-int | str --to-int
| sum | sum
| echo $it | echo $it
"# "#
)); ));

2
tests/command_mv_tests.rs
View File

@ -28,7 +28,7 @@ fn overwrites_if_moving_to_existing_file() {
Playground::setup("mv_test_2", |dirs, sandbox| { Playground::setup("mv_test_2", |dirs, sandbox| {
sandbox sandbox
.with_files(vec![ .with_files(vec![
EmptyFile("andres.txt"), EmptyFile("andres.txt"),
EmptyFile("jonathan.txt") EmptyFile("jonathan.txt")
]); ]);

16
tests/commands_test.rs
View File

@ -8,14 +8,14 @@ fn lines() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", h::pipeline( cwd: "tests/fixtures/formats", h::pipeline(
r#" r#"
open cargo_sample.toml --raw open cargo_sample.toml --raw
| lines | lines
| skip-while $it != "[dependencies]" | skip-while $it != "[dependencies]"
| skip 1 | skip 1
| first 1 | first 1
| split-column "=" | split-column "="
| get Column1 | get Column1
| trim | trim
| echo $it | echo $it
"# "#
)); ));

30
tests/filter_str_tests.rs
View File

@ -73,7 +73,7 @@ fn upcases() {
cwd: dirs.test(), cwd: dirs.test(),
"open sample.toml | str package.name --upcase | get package.name | echo $it" "open sample.toml | str package.name --upcase | get package.name | echo $it"
); );
assert_eq!(actual, "NUSHELL"); assert_eq!(actual, "NUSHELL");
}) })
} }
@ -83,11 +83,11 @@ fn converts_to_int() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", h::pipeline( cwd: "tests/fixtures/formats", h::pipeline(
r#" r#"
open caco3_plastics.csv open caco3_plastics.csv
| first 1 | first 1
| str tariff_item --to-int | str tariff_item --to-int
| where tariff_item == 2509000000 | where tariff_item == 2509000000
| get tariff_item | get tariff_item
| echo $it | echo $it
"# "#
)); ));
@ -110,9 +110,9 @@ fn replaces() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open sample.toml open sample.toml
| str package.name --replace wykittenshell | str package.name --replace wykittenshell
| get package.name | get package.name
| echo $it | echo $it
"# "#
)); ));
@ -136,9 +136,9 @@ fn find_and_replaces() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open sample.toml open sample.toml
| str fortune.teller.phone --find-replace KATZ "5289" | str fortune.teller.phone --find-replace KATZ "5289"
| get fortune.teller.phone | get fortune.teller.phone
| echo $it | echo $it
"# "#
)); ));
@ -162,9 +162,9 @@ fn find_and_replaces_without_passing_field() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open sample.toml open sample.toml
| get fortune.teller.phone | get fortune.teller.phone
| str --find-replace KATZ "5289" | str --find-replace KATZ "5289"
| echo $it | echo $it
"# "#
)); ));

174
tests/filters_test.rs
View File

@ -28,13 +28,13 @@ fn converts_structured_table_to_csv_text() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open csv_text_sample.txt open csv_text_sample.txt
| lines | lines
| split-column "," a b c d origin | split-column "," a b c d origin
| last 1 | last 1
| to-csv | to-csv
| lines | lines
| nth 1 | nth 1
| echo "$it" | echo "$it"
"# "#
)); ));
@ -58,11 +58,11 @@ fn converts_structured_table_to_csv_text_skipping_headers_after_conversion() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open csv_text_sample.txt open csv_text_sample.txt
| lines | lines
| split-column "," a b c d origin | split-column "," a b c d origin
| last 1 | last 1
| to-csv --headerless | to-csv --headerless
| echo "$it" | echo "$it"
"# "#
)); ));
@ -87,11 +87,11 @@ fn converts_from_csv_text_to_structured_table() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open los_tres_caballeros.txt open los_tres_caballeros.txt
| from-csv | from-csv
| get rusty_luck | get rusty_luck
| str --to-int | str --to-int
| sum | sum
| echo $it | echo $it
"# "#
)); ));
@ -116,11 +116,11 @@ fn converts_from_csv_text_skipping_headers_to_structured_table() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open los_tres_amigos.txt open los_tres_amigos.txt
| from-csv --headerless | from-csv --headerless
| get Column3 | get Column3
| str --to-int | str --to-int
| sum | sum
| echo $it | echo $it
"# "#
)); ));
@ -134,10 +134,10 @@ fn can_convert_table_to_json_text_and_from_json_text_back_into_table() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", h::pipeline( cwd: "tests/fixtures/formats", h::pipeline(
r#" r#"
open sgml_description.json open sgml_description.json
| to-json | to-json
| from-json | from-json
| get glossary.GlossDiv.GlossList.GlossEntry.GlossSee | get glossary.GlossDiv.GlossList.GlossEntry.GlossSee
| echo $it | echo $it
"# "#
)); ));
@ -153,8 +153,8 @@ fn converts_from_json_text_to_structured_table() {
r#" r#"
{ {
"katz": [ "katz": [
{"name": "Yehuda", "rusty_luck": 1}, {"name": "Yehuda", "rusty_luck": 1},
{"name": "Jonathan", "rusty_luck": 1}, {"name": "Jonathan", "rusty_luck": 1},
{"name": "Andres", "rusty_luck": 1}, {"name": "Andres", "rusty_luck": 1},
{"name":"GorbyPuff", "rusty_luck": 1} {"name":"GorbyPuff", "rusty_luck": 1}
] ]
@ -177,8 +177,8 @@ fn converts_from_json_text_recognizing_objects_independendtly_to_structured_tabl
sandbox.with_files(vec![FileWithContentToBeTrimmed( sandbox.with_files(vec![FileWithContentToBeTrimmed(
"katz.txt", "katz.txt",
r#" r#"
{"name": "Yehuda", "rusty_luck": 1} {"name": "Yehuda", "rusty_luck": 1}
{"name": "Jonathan", "rusty_luck": 1} {"name": "Jonathan", "rusty_luck": 1}
{"name": "Andres", "rusty_luck": 1} {"name": "Andres", "rusty_luck": 1}
{"name":"GorbyPuff", "rusty_luck": 3} {"name":"GorbyPuff", "rusty_luck": 3}
"#, "#,
@ -187,10 +187,10 @@ fn converts_from_json_text_recognizing_objects_independendtly_to_structured_tabl
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open katz.txt open katz.txt
| from-json --objects | from-json --objects
| where name == "GorbyPuff" | where name == "GorbyPuff"
| get rusty_luck | get rusty_luck
| echo $it | echo $it
"# "#
)); ));
@ -213,14 +213,14 @@ fn converts_structured_table_to_json_text() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open sample.txt open sample.txt
| lines | lines
| split-column "," name luck | split-column "," name luck
| pick name | pick name
| to-json | to-json
| nth 0 | nth 0
| from-json | from-json
| get name | get name
| echo $it | echo $it
"# "#
)); ));
@ -254,13 +254,13 @@ fn converts_structured_table_to_tsv_text() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open tsv_text_sample.txt open tsv_text_sample.txt
| lines | lines
| split-column "\t" a b c d origin | split-column "\t" a b c d origin
| last 1 | last 1
| to-tsv | to-tsv
| lines | lines
| nth 1 | nth 1
| echo "$it" | echo "$it"
"# "#
)); ));
@ -284,11 +284,11 @@ fn converts_structured_table_to_tsv_text_skipping_headers_after_conversion() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open tsv_text_sample.txt open tsv_text_sample.txt
| lines | lines
| split-column "\t" a b c d origin | split-column "\t" a b c d origin
| last 1 | last 1
| to-tsv --headerless | to-tsv --headerless
| echo "$it" | echo "$it"
"# "#
)); ));
@ -313,11 +313,11 @@ fn converts_from_tsv_text_to_structured_table() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open los_tres_amigos.txt open los_tres_amigos.txt
| from-tsv | from-tsv
| get rusty_luck | get rusty_luck
| str --to-int | str --to-int
| sum | sum
| echo $it | echo $it
"# "#
)); ));
@ -412,10 +412,10 @@ fn can_convert_table_to_yaml_text_and_from_yaml_text_back_into_table() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", h::pipeline( cwd: "tests/fixtures/formats", h::pipeline(
r#" r#"
open appveyor.yml open appveyor.yml
| to-yaml | to-yaml
| from-yaml | from-yaml
| get environment.global.PROJECT_NAME | get environment.global.PROJECT_NAME
| echo $it | echo $it
"# "#
)); ));
@ -428,16 +428,16 @@ fn can_sort_by_column() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", h::pipeline( cwd: "tests/fixtures/formats", h::pipeline(
r#" r#"
open cargo_sample.toml --raw open cargo_sample.toml --raw
| lines | lines
| skip 1 | skip 1
| first 4 | first 4
| split-column "=" | split-column "="
| sort-by Column1 | sort-by Column1
| skip 1 | skip 1
| first 1 | first 1
| get Column1 | get Column1
| trim | trim
| echo $it | echo $it
"# "#
)); ));
@ -450,13 +450,13 @@ fn can_split_by_column() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", h::pipeline( cwd: "tests/fixtures/formats", h::pipeline(
r#" r#"
open cargo_sample.toml --raw open cargo_sample.toml --raw
| lines | lines
| skip 1 | skip 1
| first 1 | first 1
| split-column "=" | split-column "="
| get Column1 | get Column1
| trim | trim
| echo $it | echo $it
"# "#
)); ));
@ -469,9 +469,9 @@ fn can_sum() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", h::pipeline( cwd: "tests/fixtures/formats", h::pipeline(
r#" r#"
open sgml_description.json open sgml_description.json
| get glossary.GlossDiv.GlossList.GlossEntry.Sections | get glossary.GlossDiv.GlossList.GlossEntry.Sections
| sum | sum
| echo $it | echo $it
"# "#
)); ));
@ -525,10 +525,10 @@ fn embed() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open los_tres_caballeros.txt open los_tres_caballeros.txt
| from-csv | from-csv
| embed caballeros | embed caballeros
| get caballeros | get caballeros
| nth 0 | nth 0
| get last_name | get last_name
| echo $it | echo $it
@ -555,8 +555,8 @@ fn get() {
let actual = nu!( let actual = nu!(
cwd: dirs.test(), h::pipeline( cwd: dirs.test(), h::pipeline(
r#" r#"
open los_tres_caballeros.txt open los_tres_caballeros.txt
| from-csv | from-csv
| nth 1 | nth 1
| get last_name | get last_name
| echo $it | echo $it

24
tests/tests.rs
View File

@ -6,11 +6,11 @@ use helpers as h;
fn pipeline_helper() { fn pipeline_helper() {
let actual = h::pipeline( let actual = h::pipeline(
r#" r#"
open los_tres_amigos.txt open los_tres_amigos.txt
| from-csv | from-csv
| get rusty_luck | get rusty_luck
| str --to-int | str --to-int
| sum | sum
| echo "$it" | echo "$it"
"#); "#);
@ -30,7 +30,7 @@ fn external_num() {
#[test] #[test]
fn external_has_correct_quotes() { fn external_has_correct_quotes() {
let actual = nu!( let actual = nu!(
cwd: ".", cwd: ".",
r#"echo "hello world""# r#"echo "hello world""#
); );
@ -44,9 +44,9 @@ fn add_plugin() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", h::pipeline( cwd: "tests/fixtures/formats", h::pipeline(
r#" r#"
open cargo_sample.toml open cargo_sample.toml
| add dev-dependencies.newdep "1" | add dev-dependencies.newdep "1"
| get dev-dependencies.newdep | get dev-dependencies.newdep
| echo $it | echo $it
"# "#
)); ));
@ -59,9 +59,9 @@ fn edit_plugin() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", h::pipeline( cwd: "tests/fixtures/formats", h::pipeline(
r#" r#"
open cargo_sample.toml open cargo_sample.toml
| edit dev-dependencies.pretty_assertions "7" | edit dev-dependencies.pretty_assertions "7"
| get dev-dependencies.pretty_assertions | get dev-dependencies.pretty_assertions
| echo $it | echo $it
"# "#
)); ));