Skip to content

Commit 31ba212

Browse files
borsbors
committed
Auto merge of #23436 - Manishearth:rollup, r=Manishearth
r? @Manishearth
2 parents 883551b + dcec88c commit 31ba212

File tree

511 files changed

+1851
-1902
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

511 files changed

+1851
-1902
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Read ["Installing Rust"] from [The Book].
6464
# Choose one based on platform:
6565
$ pacman -S mingw-w64-i686-toolchain
6666
$ pacman -S mingw-w64-x86_64-toolchain
67-
67+
6868
$ pacman -S base-devel
6969
```
7070

‎mk/cfg/x86_64-unknown-linux-gnu.mk

-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,3 @@ CFG_LDPATH_x86_64-unknown-linux-gnu :=
2525
CFG_RUN_x86_64-unknown-linux-gnu=$(2)
2626
CFG_RUN_TARG_x86_64-unknown-linux-gnu=$(call CFG_RUN_x86_64-unknown-linux-gnu,,$(2))
2727
CFG_GNU_TRIPLE_x86_64-unknown-linux-gnu := x86_64-unknown-linux-gnu
28-

‎mk/prepare.mk

-2
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,3 @@ prepare-maybe-clean-$(1):
221221

222222

223223
endef
224-
225-

‎mk/util.mk

-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ else
1717
endif
1818

1919
S := $(CFG_SRC_DIR)
20-

‎src/doc/grammar.md

+49-49
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ transcriber : '(' transcriber * ')' | '[' transcriber * ']'
290290

291291
# Items and attributes
292292

293-
**FIXME:** grammar?
293+
**FIXME:** grammar?
294294

295295
## Items
296296

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

302302
### Type Parameters
303303

304-
**FIXME:** grammar?
304+
**FIXME:** grammar?
305305

306306
### Modules
307307

@@ -338,35 +338,35 @@ path_item : ident | "mod" ;
338338

339339
### Functions
340340

341-
**FIXME:** grammar?
341+
**FIXME:** grammar?
342342

343343
#### Generic functions
344344

345-
**FIXME:** grammar?
345+
**FIXME:** grammar?
346346

347347
#### Unsafety
348348

349-
**FIXME:** grammar?
349+
**FIXME:** grammar?
350350

351351
##### Unsafe functions
352352

353-
**FIXME:** grammar?
353+
**FIXME:** grammar?
354354

355355
##### Unsafe blocks
356356

357-
**FIXME:** grammar?
357+
**FIXME:** grammar?
358358

359359
#### Diverging functions
360360

361-
**FIXME:** grammar?
361+
**FIXME:** grammar?
362362

363363
### Type definitions
364364

365-
**FIXME:** grammar?
365+
**FIXME:** grammar?
366366

367367
### Structures
368368

369-
**FIXME:** grammar?
369+
**FIXME:** grammar?
370370

371371
### Constant items
372372

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

383383
#### Mutable statics
384384

385-
**FIXME:** grammar?
385+
**FIXME:** grammar?
386386

387387
### Traits
388388

389-
**FIXME:** grammar?
389+
**FIXME:** grammar?
390390

391391
### Implementations
392392

393-
**FIXME:** grammar?
393+
**FIXME:** grammar?
394394

395395
### External blocks
396396

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

402402
## Visibility and Privacy
403403

404-
**FIXME:** grammar?
404+
**FIXME:** grammar?
405405

406406
### Re-exporting and Visibility
407407

408-
**FIXME:** grammar?
408+
**FIXME:** grammar?
409409

410410
## Attributes
411411

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

421421
## Statements
422422

423-
**FIXME:** grammar?
423+
**FIXME:** grammar?
424424

425425
### Declaration statements
426426

427-
**FIXME:** grammar?
427+
**FIXME:** grammar?
428428

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

433433
#### Item declarations
434434

435-
**FIXME:** grammar?
435+
**FIXME:** grammar?
436436

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

451451
### Expression statements
452452

453-
**FIXME:** grammar?
453+
**FIXME:** grammar?
454454

455455
## Expressions
456456

457-
**FIXME:** grammar?
457+
**FIXME:** grammar?
458458

459459
#### Lvalues, rvalues and temporaries
460460

461-
**FIXME:** grammar?
461+
**FIXME:** grammar?
462462

463463
#### Moved and copied types
464464

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

467467
### Literal expressions
468468

469-
**FIXME:** grammar?
469+
**FIXME:** grammar?
470470

471471
### Path expressions
472472

473-
**FIXME:** grammar?
473+
**FIXME:** grammar?
474474

475475
### Tuple expressions
476476

477-
**FIXME:** grammar?
477+
**FIXME:** grammar?
478478

479479
### Unit expressions
480480

481-
**FIXME:** grammar?
481+
**FIXME:** grammar?
482482

483483
### Structure expressions
484484

@@ -527,7 +527,7 @@ idx_expr : expr '[' expr ']' ;
527527

528528
### Unary operator expressions
529529

530-
**FIXME:** grammar?
530+
**FIXME:** grammar?
531531

532532
### Binary operator expressions
533533

@@ -537,31 +537,31 @@ binop_expr : expr binop expr ;
537537

538538
#### Arithmetic operators
539539

540-
**FIXME:** grammar?
540+
**FIXME:** grammar?
541541

542542
#### Bitwise operators
543543

544-
**FIXME:** grammar?
544+
**FIXME:** grammar?
545545

546546
#### Lazy boolean operators
547547

548-
**FIXME:** grammar?
548+
**FIXME:** grammar?
549549

550550
#### Comparison operators
551551

552-
**FIXME:** grammar?
552+
**FIXME:** grammar?
553553

554554
#### Type cast expressions
555555

556-
**FIXME:** grammar?
556+
**FIXME:** grammar?
557557

558558
#### Assignment expressions
559559

560-
**FIXME:** grammar?
560+
**FIXME:** grammar?
561561

562562
#### Compound assignment expressions
563563

564-
**FIXME:** grammar?
564+
**FIXME:** grammar?
565565

566566
#### Operator precedence
567567

@@ -680,49 +680,49 @@ return_expr : "return" expr ? ;
680680

681681
# Type system
682682

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

685685
## Types
686686

687687
### Primitive types
688688

689-
**FIXME:** grammar?
689+
**FIXME:** grammar?
690690

691691
#### Machine types
692692

693-
**FIXME:** grammar?
693+
**FIXME:** grammar?
694694

695695
#### Machine-dependent integer types
696696

697-
**FIXME:** grammar?
697+
**FIXME:** grammar?
698698

699699
### Textual types
700700

701-
**FIXME:** grammar?
701+
**FIXME:** grammar?
702702

703703
### Tuple types
704704

705-
**FIXME:** grammar?
705+
**FIXME:** grammar?
706706

707707
### Array, and Slice types
708708

709-
**FIXME:** grammar?
709+
**FIXME:** grammar?
710710

711711
### Structure types
712712

713-
**FIXME:** grammar?
713+
**FIXME:** grammar?
714714

715715
### Enumerated types
716716

717-
**FIXME:** grammar?
717+
**FIXME:** grammar?
718718

719719
### Pointer types
720720

721-
**FIXME:** grammar?
721+
**FIXME:** grammar?
722722

723723
### Function types
724724

725-
**FIXME:** grammar?
725+
**FIXME:** grammar?
726726

727727
### Closure types
728728

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

740740
### Object types
741741

742-
**FIXME:** grammar?
742+
**FIXME:** grammar?
743743

744744
### Type parameters
745745

746-
**FIXME:** grammar?
746+
**FIXME:** grammar?
747747

748748
### Self types
749749

750-
**FIXME:** grammar?
750+
**FIXME:** grammar?
751751

752752
## Type kinds
753753

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

756756
# Memory and concurrency models
757757

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

760760
## Memory model
761761

‎src/doc/intro.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ right at home if you've used tools like [Bundler](http://bundler.io/),
140140
[npm](https://www.npmjs.org/), or [pip](https://pip.pypa.io/en/latest/).
141141
There's no `Makefile`s or endless `autotools` output here. (Rust's tooling does
142142
[play nice with external libraries written in those
143-
tools](http://crates.io/native-build.html), if you need to.)
143+
tools](http://doc.crates.io/build-script.html), if you need to.)
144144

145145
Enough about tools, let's talk code!
146146

‎src/doc/not_found.md

-1
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,3 @@ function populate_rust_search() {
6363
populate_site_search();
6464
populate_rust_search();
6565
</script>
66-

‎src/doc/reference.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -1961,16 +1961,18 @@ module through the rules above. It essentially allows public access into the
19611961
re-exported item. For example, this program is valid:
19621962

19631963
```
1964-
pub use self::implementation as api;
1964+
pub use self::implementation::api;
19651965
19661966
mod implementation {
1967-
pub fn f() {}
1967+
pub mod api {
1968+
pub fn f() {}
1969+
}
19681970
}
19691971
19701972
# fn main() {}
19711973
```
19721974

1973-
This means that any external crate referencing `implementation::f` would
1975+
This means that any external crate referencing `implementation::api::f` would
19741976
receive a privacy violation, while the path `api::f` would be allowed.
19751977

19761978
When re-exporting a private item, it can be thought of as allowing the "privacy

‎src/doc/trpl/arrays-vectors-and-slices.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ languages.
4949

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

5555
```{rust}

‎src/doc/trpl/crates-and-modules.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -551,9 +551,9 @@ module, we now have a `phrases::japanese::hello()` function and a
551551
`phrases::japanese::farewells::goodbye()`. Our internal organization doesn't
552552
define our external interface.
553553
554-
Here we have a `pub use` for each function we want to bring into the
554+
Here we have a `pub use` for each function we want to bring into the
555555
`japanese` scope. We could alternatively use the wildcard syntax to include
556-
everything from `greetings` into the current scope: `pub use self::greetings::*`.
556+
everything from `greetings` into the current scope: `pub use self::greetings::*`.
557557
558558
What about the `self`? Well, by default, `use` declarations are absolute paths,
559559
starting from your crate root. `self` makes that path relative to your current

0 commit comments

Comments
 (0)