Skip to content

Commit 0c5509e

Browse files
author
kgv
committed
---
yaml --- r: 196055 b: refs/heads/beta c: 343c110 h: refs/heads/master i: 196053: a9c9cd7 196051: 606aa7e 196047: 83d8f1d v: v3
1 parent b8872de commit 0c5509e

File tree

361 files changed

+7295
-7582
lines changed

Some content is hidden

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

361 files changed

+7295
-7582
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3030
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3131
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
32-
refs/heads/beta: a3f6273795363c29f3b70c9fa1229c3ed5c14afd
32+
refs/heads/beta: 343c110e76ddb673ed8bfc22ea917c3146c7b6e3
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3535
refs/heads/tmp: 9de34a84bb300bab1bf0227f577331620cd60511

branches/beta/src/compiletest/compiletest.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#![feature(std_misc)]
1919
#![feature(test)]
2020
#![feature(path_ext)]
21+
#![feature(convert)]
2122
#![feature(str_char)]
2223

2324
#![deny(warnings)]

branches/beta/src/doc/reference.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -977,13 +977,17 @@ An example of `use` declarations:
977977

978978
```
979979
# #![feature(core)]
980+
use std::iter::range_step;
980981
use std::option::Option::{Some, None};
981982
use std::collections::hash_map::{self, HashMap};
982983
983984
fn foo<T>(_: T){}
984985
fn bar(map1: HashMap<String, usize>, map2: hash_map::HashMap<String, usize>){}
985986
986987
fn main() {
988+
// Equivalent to 'std::iter::range_step(0, 10, 2);'
989+
range_step(0, 10, 2);
990+
987991
// Equivalent to 'foo(vec![std::option::Option::Some(1.0f64),
988992
// std::option::Option::None]);'
989993
foo(vec![Some(1.0f64), None]);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,5 @@
4242
* [Intrinsics](intrinsics.md)
4343
* [Lang items](lang-items.md)
4444
* [Link args](link-args.md)
45-
* [Benchmark Tests](benchmark-tests.md)
4645
* [Conclusion](conclusion.md)
4746
* [Glossary](glossary.md)

branches/beta/src/doc/trpl/benchmark-tests.md

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

0 commit comments

Comments
 (0)