Skip to content

Commit 3a49ca0

Browse files
author
kgv
committed
---
yaml --- r: 195579 b: refs/heads/master c: 343c110 h: refs/heads/master i: 195577: 3f50b15 195575: 8a4aff2 v: v3
1 parent a842297 commit 3a49ca0

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
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: a3f6273795363c29f3b70c9fa1229c3ed5c14afd
2+
refs/heads/master: 343c110e76ddb673ed8bfc22ea917c3146c7b6e3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b3317d68910900f135f9f38e43a7a699bc736b4a
55
refs/heads/try: 961e0358e1a5c0faaef606e31e9965742c1643bf

trunk/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)]

trunk/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]);

trunk/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)

trunk/src/doc/trpl/benchmark-tests.md

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

0 commit comments

Comments
 (0)