Skip to content

Commit 3249f6f

Browse files
committed
---
yaml --- r: 235855 b: refs/heads/stable c: 847fba0 h: refs/heads/master i: 235853: d7fed51 235851: 99299b4 235847: 65cf906 235839: 5963f11 v: v3
1 parent 51f32e7 commit 3249f6f

File tree

106 files changed

+875
-3494
lines changed

Some content is hidden

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

106 files changed

+875
-3494
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 6232f958cd42960f64456566dc56ed15470761f4
32+
refs/heads/stable: 847fba06c3005d05ddd22d82cdabc66a0e9e378e
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/doc/reference.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,10 +1636,6 @@ The type of a function declared in an extern block is `extern "abi" fn(A1, ...,
16361636
An) -> R`, where `A1...An` are the declared types of its arguments and `R` is
16371637
the declared return type.
16381638

1639-
It is valid to add the `link` attribute on an empty extern block. You can use
1640-
this to satisfy the linking requirements of extern blocks elsewhere in your code
1641-
(including upstream crates) instead of adding the attribute to each extern block.
1642-
16431639
## Visibility and Privacy
16441640

16451641
These two terms are often used interchangeably, and what they are attempting to
@@ -2368,8 +2364,6 @@ The currently implemented features of the reference compiler are:
23682364
internally without imposing on callers
23692365
(i.e. making them behave like function calls in
23702366
terms of encapsulation).
2371-
* - `default_type_parameter_fallback` - Allows type parameter defaults to
2372-
influence type inference.
23732367

23742368
If a feature is promoted to a language feature, then all existing programs will
23752369
start to receive compilation warnings about `#![feature]` directives which enabled

branches/stable/src/doc/rust.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,6 @@ a > code {
221221
color: #428BCA;
222222
}
223223

224-
.section-header > a > code {
225-
color: #8D1A38;
226-
}
227-
228224
/* Code highlighting */
229225
pre.rust .kw { color: #8959A8; }
230226
pre.rust .kw-2, pre.rust .prelude-ty { color: #4271AE; }

branches/stable/src/doc/trpl/SUMMARY.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* [Iterators](iterators.md)
1717
* [Concurrency](concurrency.md)
1818
* [Error Handling](error-handling.md)
19-
* [Choosing your Guarantees](choosing-your-guarantees.md)
2019
* [FFI](ffi.md)
2120
* [Borrow and AsRef](borrow-and-asref.md)
2221
* [Release Channels](release-channels.md)
@@ -64,7 +63,7 @@
6463
* [No stdlib](no-stdlib.md)
6564
* [Intrinsics](intrinsics.md)
6665
* [Lang items](lang-items.md)
67-
* [Advanced linking](advanced-linking.md)
66+
* [Link args](link-args.md)
6867
* [Benchmark Tests](benchmark-tests.md)
6968
* [Box Syntax and Patterns](box-syntax-and-patterns.md)
7069
* [Slice Patterns](slice-patterns.md)

branches/stable/src/doc/trpl/advanced-linking.md

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)