Skip to content

Commit 0f2ed98

Browse files
committed
---
yaml --- r: 220508 b: refs/heads/auto c: bfa0e1f h: refs/heads/master v: v3
1 parent e6a8c9d commit 0f2ed98

File tree

109 files changed

+1470
-971
lines changed

Some content is hidden

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

109 files changed

+1470
-971
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 5df259b9da287043e8284eb53d61a17b89a89bee
11+
refs/heads/auto: bfa0e1f58acf1c28d500c34ed258f09ae021893e
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/doc/trpl/testing.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,11 @@ that our tests are entirely left out of a normal build.
250250

251251
The second change is the `use` declaration. Because we're in an inner module,
252252
we need to bring our test function into scope. This can be annoying if you have
253-
a large module, and so this is a common use of globs. Let's change our
254-
`src/lib.rs` to make use of it:
253+
a large module, and so this is a common use of the `glob` feature. Let's change
254+
our `src/lib.rs` to make use of it:
255255

256256
```rust,ignore
257+
257258
pub fn add_two(a: i32) -> i32 {
258259
a + 2
259260
}

branches/auto/src/liballoc/boxed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ use core::hash::{self, Hash};
6262
use core::marker::Unsize;
6363
use core::mem;
6464
use core::ops::{CoerceUnsized, Deref, DerefMut};
65-
use core::ptr::{Unique};
65+
use core::ptr::Unique;
6666
use core::raw::{TraitObject};
6767

6868
/// A value that represents the heap. This is the default place that the `box`

branches/auto/src/liballoc/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
#![feature(unique)]
8989
#![feature(unsafe_no_drop_flag, filling_drop)]
9090
#![feature(unsize)]
91+
#![feature(core_slice_ext)]
9192

9293
#![cfg_attr(test, feature(test, alloc, rustc_private, box_raw))]
9394
#![cfg_attr(all(not(feature = "external_funcs"), not(feature = "external_crate")),
@@ -122,6 +123,7 @@ mod boxed { pub use std::boxed::{Box, HEAP}; }
122123
mod boxed_test;
123124
pub mod arc;
124125
pub mod rc;
126+
pub mod raw_vec;
125127

126128
/// Common out-of-memory routine
127129
#[cold]

0 commit comments

Comments
 (0)