Skip to content

Commit

Permalink
remove mentions to old and deprecated && and || logic operators (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
amtoine committed Feb 28, 2023
1 parent b82e9d5 commit 8d72b5f
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions book/dataframes.md
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ The masks can also be created from Nushell lists, for example:
To create complex masks, we have the `AND`
```shell
> $mask && $mask1
> $mask and $mask1
───┬──────────────────
# │ and_new_col_mask
Expand All @@ -742,7 +742,7 @@ To create complex masks, we have the `AND`
and `OR` operations
```shell
> $mask || $mask1
> $mask or $mask1
───┬─────────────────
# │ or_new_col_mask
Expand Down
4 changes: 2 additions & 2 deletions book/nushell_operator_map.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ Note: this table assumes Nu 0.14.1 or later.
| \*\* | pow | \*\* | Power | Pow | \*\* |
| in | in | re, in, startswith | Contains, StartsWith | -In | case in |
| not-in | not in | not in | Except | -NotIn | |
| && | and | and | && | -And, && | -a, && |
| \|\| | or | or | \|\| | -Or, \|\| | -o, \|\| |
| and | and | and | && | -And, && | -a, && |
| or | or | or | \|\| | -Or, \|\| | -o, \|\| |
2 changes: 1 addition & 1 deletion cookbook/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Nu can help with common `Git` tasks like removing all local branches which have
**Warning**: This command will hard delete the merged branches from your machine. You may want to check the branches selected for deletion by omitting the last git command.

```shell
> git branch --merged | lines | where ($it != "* master" && $it != "* main") | each {|br| git branch -D ($br | str trim) } | str trim
> git branch --merged | lines | where ($it != "* master" and $it != "* main") | each {|br| git branch -D ($br | str trim) } | str trim
```

Output
Expand Down
4 changes: 2 additions & 2 deletions es/book/instalacion.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,15 @@ Git nos clonará el repositorio principal de Nu. Partiendo de ahí podemos contr
```

> cd nushell
> nushell> cargo build --workspace --features=stable && cargo run --features=stable
> nushell> cargo build --workspace --features=stable; cargo run --features=stable
```
También puedes construir y arrancar Nu en modo release:
```

nushell> cargo build --release --workspace --features=stable && cargo run --release --features=stable
nushell> cargo build --release --workspace --features=stable; cargo run --release --features=stable

```
Gente familiarizada con Rust se preguntará la razón por la que hacemos un paso "build" y otro paso "run" si "run" construye por defecto. Esto es para evitar una deficiencia de la nueva opción `default-run` en Cargo y asegurar que todos los plugins se construyan aunque puede que esto no sea necesario en el futuro.
Expand Down
4 changes: 2 additions & 2 deletions es/book/mapa_operador_nushell.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ Nota: esta tabla asume Nu 0.14.1 o posterior.
| / | / | / | / | / | / |
| in | in | re, in, startswith | Contains, StartsWith | -In | case in |
| not-in | not in | not in | Except | -NotIn | |
| && | and | and | && | -And | -a, && |
| \|\| | or | or | \|\| | -Or | -o, \|\| |
| and | and | and | && | -And | -a, && |
| or | or | or | \|\| | -Or | -o, \|\| |
4 changes: 2 additions & 2 deletions ja/book/nushell_operator_map.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
| / | / | / | / | / | / |
| in | in | re, in, startswith | Contains, StartsWith | -In | case in |
| not-in | not in | not in | Except | -NotIn | |
| && | and | and | && | -And | -a, && |
| \|\| | or | or | \|\| | -Or | -o, \|\| |
| and | and | and | && | -And | -a, && |
| or | or | or | \|\| | -Or | -o, \|\| |
4 changes: 2 additions & 2 deletions pt-BR/book/instalacao.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ O Git vai clonar o repositório principal do nushell e daí podemos fazer o buil

```bash
> cd nushell
nushell> cargo build --workspace --features=stable && cargo run --features=stable
nushell> cargo build --workspace --features=stable; cargo run --features=stable
```

Você também pode fazer o build e rodar o Nu em modo release:

```bash
nushell> cargo build --release --workspace --features=stable && cargo run --release --features=stable
nushell> cargo build --release --workspace --features=stable; cargo run --release --features=stable
```

Pessoas mais acostumadas com Rust podem se perguntar por que fazemos tanto o "build" como o "run" se o "run" já faz o build por padrão. Isso serve para contornar uma falha da nova opção `default-run` no Cargo e assegurar que será feito o build de todos os plugins, embora possa não ser necessário no futuro.
Expand Down
2 changes: 1 addition & 1 deletion snippets/installation/build_nu_from_source.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
> cd nushell
nushell> cargo build --workspace && cargo run
nushell> cargo build --workspace; cargo run
2 changes: 1 addition & 1 deletion snippets/installation/build_nu_from_source_release.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nushell> cargo build --release --workspace && cargo run --release
nushell> cargo build --release --workspace; cargo run --release
4 changes: 2 additions & 2 deletions zh-CN/book/dataframes.md
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ Nushell 的管道系统可以帮助你创建非常有趣的工作流程。
为了创建复杂的掩码,我们可以使用`AND`
```shell
> $mask && $mask1
> $mask and $mask1
───┬──────────────────
# │ and_new_col_mask
Expand All @@ -641,7 +641,7 @@ Nushell 的管道系统可以帮助你创建非常有趣的工作流程。
或者 `OR` 操作:
```shell
> $mask || $mask1
> $mask or $mask1
───┬─────────────────
# │ or_new_col_mask
Expand Down
4 changes: 2 additions & 2 deletions zh-CN/book/nushell_operator_map.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
| \*\* | pow | \*\* | Power | Pow | \*\* |
| in | in | re, in, startswith | Contains, StartsWith | -In | case in |
| not-in | not in | not in | Except | -NotIn | |
| && | and | and | && | -And, && | -a, && |
| \|\| | or | or | \|\| | -Or, \|\| | -o, \|\| |
| and | and | and | && | -And, && | -a, && |
| or | or | or | \|\| | -Or, \|\| | -o, \|\| |

0 comments on commit 8d72b5f

Please sign in to comment.