Skip to content

Commit 5ee9d9e

Browse files
committed
Rollup merge of rust-lang#22308 - steveklabnik:gh19278, r=brson
Fixes rust-lang#19278
2 parents 6aaf535 + 1a99315 commit 5ee9d9e

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

mk/docs.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
######################################################################
2828
DOCS := index intro tutorial complement-bugreport \
2929
complement-lang-faq complement-design-faq complement-project-faq \
30-
rustdoc reference
30+
rustdoc reference grammar
3131

3232
# Legacy guides, preserved for a while to reduce the number of 404s
3333
DOCS += guide-crates guide-error-handling guide-ffi guide-macros guide \

src/doc/grammar.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# **This is a work in progress**
2-
3-
% The Rust Grammar
1+
% Grammar
42

53
# Introduction
64

src/doc/reference.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
This document is the primary reference for the Rust programming language. It
66
provides three kinds of material:
77

8-
- Chapters that formally define the language grammar and, for each
9-
construct, informally describe its semantics and give examples of its
10-
use.
8+
- Chapters that informally describe each language construct and their use.
119
- Chapters that informally describe the memory model, concurrency model,
1210
runtime services, linkage model and debugging facilities.
1311
- Appendix chapters providing rationale and references to languages that
@@ -23,8 +21,11 @@ separately by extracting documentation attributes from their source code. Many
2321
of the features that one might expect to be language features are library
2422
features in Rust, so what you're looking for may be there, not here.
2523

24+
You may also be interested in the [grammar].
25+
2626
[book]: book/index.html
2727
[standard]: std/index.html
28+
[grammar]: grammar.html
2829

2930
# Notation
3031

0 commit comments

Comments
 (0)