Skip to content

Cleanup whitespace #23385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Read ["Installing Rust"] from [The Book].
# Choose one based on platform:
$ pacman -S mingw-w64-i686-toolchain
$ pacman -S mingw-w64-x86_64-toolchain
$ pacman -S base-devel
```
Expand Down
1 change: 0 additions & 1 deletion mk/cfg/x86_64-unknown-linux-gnu.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ CFG_LDPATH_x86_64-unknown-linux-gnu :=
CFG_RUN_x86_64-unknown-linux-gnu=$(2)
CFG_RUN_TARG_x86_64-unknown-linux-gnu=$(call CFG_RUN_x86_64-unknown-linux-gnu,,$(2))
CFG_GNU_TRIPLE_x86_64-unknown-linux-gnu := x86_64-unknown-linux-gnu

2 changes: 0 additions & 2 deletions mk/prepare.mk
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,3 @@ prepare-maybe-clean-$(1):


endef


1 change: 0 additions & 1 deletion mk/util.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ else
endif

S := $(CFG_SRC_DIR)

98 changes: 49 additions & 49 deletions src/doc/grammar.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ transcriber : '(' transcriber * ')' | '[' transcriber * ']'

# Items and attributes

**FIXME:** grammar?
**FIXME:** grammar?

## Items

Expand All @@ -301,7 +301,7 @@ item : mod_item | fn_item | type_item | struct_item | enum_item

### Type Parameters

**FIXME:** grammar?
**FIXME:** grammar?

### Modules

Expand Down Expand Up @@ -338,35 +338,35 @@ path_item : ident | "mod" ;

### Functions

**FIXME:** grammar?
**FIXME:** grammar?

#### Generic functions

**FIXME:** grammar?
**FIXME:** grammar?

#### Unsafety

**FIXME:** grammar?
**FIXME:** grammar?

##### Unsafe functions

**FIXME:** grammar?
**FIXME:** grammar?

##### Unsafe blocks

**FIXME:** grammar?
**FIXME:** grammar?

#### Diverging functions

**FIXME:** grammar?
**FIXME:** grammar?

### Type definitions

**FIXME:** grammar?
**FIXME:** grammar?

### Structures

**FIXME:** grammar?
**FIXME:** grammar?

### Constant items

Expand All @@ -382,15 +382,15 @@ static_item : "static" ident ':' type '=' expr ';' ;

#### Mutable statics

**FIXME:** grammar?
**FIXME:** grammar?

### Traits

**FIXME:** grammar?
**FIXME:** grammar?

### Implementations

**FIXME:** grammar?
**FIXME:** grammar?

### External blocks

Expand All @@ -401,11 +401,11 @@ extern_block : [ foreign_fn ] * ;

## Visibility and Privacy

**FIXME:** grammar?
**FIXME:** grammar?

### Re-exporting and Visibility

**FIXME:** grammar?
**FIXME:** grammar?

## Attributes

Expand All @@ -420,19 +420,19 @@ meta_seq : meta_item [ ',' meta_seq ] ? ;

## Statements

**FIXME:** grammar?
**FIXME:** grammar?

### Declaration statements

**FIXME:** grammar?
**FIXME:** grammar?

A _declaration statement_ is one that introduces one or more *names* into the
enclosing statement block. The declared names may denote new slots or new
items.

#### Item declarations

**FIXME:** grammar?
**FIXME:** grammar?

An _item declaration statement_ has a syntactic form identical to an
[item](#items) declaration within a module. Declaring an item — a
Expand All @@ -450,35 +450,35 @@ init : [ '=' ] expr ;

### Expression statements

**FIXME:** grammar?
**FIXME:** grammar?

## Expressions

**FIXME:** grammar?
**FIXME:** grammar?

#### Lvalues, rvalues and temporaries

**FIXME:** grammar?
**FIXME:** grammar?

#### Moved and copied types

**FIXME:** Do we want to capture this in the grammar as different productions?
**FIXME:** Do we want to capture this in the grammar as different productions?

### Literal expressions

**FIXME:** grammar?
**FIXME:** grammar?

### Path expressions

**FIXME:** grammar?
**FIXME:** grammar?

### Tuple expressions

**FIXME:** grammar?
**FIXME:** grammar?

### Unit expressions

**FIXME:** grammar?
**FIXME:** grammar?

### Structure expressions

Expand Down Expand Up @@ -527,7 +527,7 @@ idx_expr : expr '[' expr ']' ;

### Unary operator expressions

**FIXME:** grammar?
**FIXME:** grammar?

### Binary operator expressions

Expand All @@ -537,31 +537,31 @@ binop_expr : expr binop expr ;

#### Arithmetic operators

**FIXME:** grammar?
**FIXME:** grammar?

#### Bitwise operators

**FIXME:** grammar?
**FIXME:** grammar?

#### Lazy boolean operators

**FIXME:** grammar?
**FIXME:** grammar?

#### Comparison operators

**FIXME:** grammar?
**FIXME:** grammar?

#### Type cast expressions

**FIXME:** grammar?
**FIXME:** grammar?

#### Assignment expressions

**FIXME:** grammar?
**FIXME:** grammar?

#### Compound assignment expressions

**FIXME:** grammar?
**FIXME:** grammar?

#### Operator precedence

Expand Down Expand Up @@ -680,49 +680,49 @@ return_expr : "return" expr ? ;

# Type system

**FIXME:** is this entire chapter relevant here? Or should it all have been covered by some production already?
**FIXME:** is this entire chapter relevant here? Or should it all have been covered by some production already?

## Types

### Primitive types

**FIXME:** grammar?
**FIXME:** grammar?

#### Machine types

**FIXME:** grammar?
**FIXME:** grammar?

#### Machine-dependent integer types

**FIXME:** grammar?
**FIXME:** grammar?

### Textual types

**FIXME:** grammar?
**FIXME:** grammar?

### Tuple types

**FIXME:** grammar?
**FIXME:** grammar?

### Array, and Slice types

**FIXME:** grammar?
**FIXME:** grammar?

### Structure types

**FIXME:** grammar?
**FIXME:** grammar?

### Enumerated types

**FIXME:** grammar?
**FIXME:** grammar?

### Pointer types

**FIXME:** grammar?
**FIXME:** grammar?

### Function types

**FIXME:** grammar?
**FIXME:** grammar?

### Closure types

Expand All @@ -739,23 +739,23 @@ bound := path | lifetime

### Object types

**FIXME:** grammar?
**FIXME:** grammar?

### Type parameters

**FIXME:** grammar?
**FIXME:** grammar?

### Self types

**FIXME:** grammar?
**FIXME:** grammar?

## Type kinds

**FIXME:** this this probably not relevant to the grammar...

# Memory and concurrency models

**FIXME:** is this entire chapter relevant here? Or should it all have been covered by some production already?
**FIXME:** is this entire chapter relevant here? Or should it all have been covered by some production already?

## Memory model

Expand Down
1 change: 0 additions & 1 deletion src/doc/not_found.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,3 @@ function populate_rust_search() {
populate_site_search();
populate_rust_search();
</script>

2 changes: 1 addition & 1 deletion src/doc/trpl/arrays-vectors-and-slices.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ languages.

A *vector* is a dynamic or "growable" array, implemented as the standard
library type [`Vec<T>`](../std/vec/) (we'll talk about what the `<T>` means
later). Vectors always allocate their data on the heap. Vectors are to slices
later). Vectors always allocate their data on the heap. Vectors are to slices
what `String` is to `&str`. You can create them with the `vec!` macro:

```{rust}
Expand Down
4 changes: 2 additions & 2 deletions src/doc/trpl/crates-and-modules.md
Original file line number Diff line number Diff line change
Expand Up @@ -551,9 +551,9 @@ module, we now have a `phrases::japanese::hello()` function and a
`phrases::japanese::farewells::goodbye()`. Our internal organization doesn't
define our external interface.
Here we have a `pub use` for each function we want to bring into the
Here we have a `pub use` for each function we want to bring into the
`japanese` scope. We could alternatively use the wildcard syntax to include
everything from `greetings` into the current scope: `pub use self::greetings::*`.
everything from `greetings` into the current scope: `pub use self::greetings::*`.
What about the `self`? Well, by default, `use` declarations are absolute paths,
starting from your crate root. `self` makes that path relative to your current
Expand Down
11 changes: 5 additions & 6 deletions src/doc/trpl/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,23 +306,23 @@ println!("{}", x + y);
Here's the same explanation, in raw text:

> First, we set `x` to five:
>
>
> ```text
> let x = 5;
> # let y = 6;
> # println!("{}", x + y);
> ```
>
>
> Next, we set `y` to six:
>
>
> ```text
> # let x = 5;
> let y = 6;
> # println!("{}", x + y);
> ```
>
>
> Finally, we print the sum of `x` and `y`:
>
>
> ```text
> # let x = 5;
> # let y = 6;
Expand Down Expand Up @@ -521,4 +521,3 @@ This sets a few different options, with a logo, favicon, and a root URL.
- `--html-before-content FILE`: includes the contents of FILE directly after
`<body>`, before the rendered content (including the search bar).
- `--html-after-content FILE`: includes the contents of FILE after all the rendered content.

1 change: 0 additions & 1 deletion src/doc/trpl/ffi.md
Original file line number Diff line number Diff line change
Expand Up @@ -543,4 +543,3 @@ The `extern` makes this function adhere to the C calling convention, as
discussed above in "[Foreign Calling
Conventions](ffi.html#foreign-calling-conventions)". The `no_mangle`
attribute turns off Rust's name mangling, so that it is easier to link to.

Loading