Skip to content

Commit 32c32ba

Browse files
committed
---
yaml --- r: 124271 b: refs/heads/try c: c199790 h: refs/heads/master i: 124269: a3e5ce6 124267: fc68eff 124263: 1e7e60d 124255: 4325127 v: v3
1 parent 4879616 commit 32c32ba

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 6c35d513cea468b30759b4f78becf28f11a123c0
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: afbcbbc77ffc6b10053bc543daf7d2e05d68cc01
5-
refs/heads/try: 46266bd60651b75e476115ec97a4ab0c4f9f462a
5+
refs/heads/try: c199790077587e88445b0244c34e0a4a526d6498
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ pub mod lint;
126126

127127
pub mod util {
128128
pub use rustc_back::fs;
129+
pub use rustc_back::sha2;
129130

130131
pub mod common;
131132
pub mod ppaux;
132-
pub mod sha2;
133133
pub mod nodemap;
134134
}
135135

branches/try/src/librustc_back/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
3333
html_root_url = "http://doc.rust-lang.org/")]
3434

35-
#![feature(globs)]
36-
#![feature(phase)]
35+
#![feature(globs, phase, macro_rules)]
3736
#![allow(unused_attribute)] // NOTE: remove after stage0
3837

3938
#[phase(plugin, link)]
4039
extern crate log;
4140
extern crate syntax;
4241
extern crate libc;
4342
extern crate flate;
43+
extern crate serialize;
4444

4545
pub mod abi;
4646
pub mod archive;
@@ -49,6 +49,7 @@ pub mod fs;
4949
pub mod mips;
5050
pub mod mipsel;
5151
pub mod rpath;
52+
pub mod sha2;
5253
pub mod svh;
5354
pub mod target_strs;
5455
pub mod x86;

branches/try/src/librustc/util/sha2.rs renamed to branches/try/src/librustc_back/sha2.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
//! use. This implementation is not intended for external use or for any use where security is
1313
//! important.
1414
15+
#![allow(deprecated)] // to_be32
16+
1517
use std::iter::range_step;
1618
use std::num::Zero;
1719
use std::slice::bytes::{MutableByteVector, copy_memory};

0 commit comments

Comments
 (0)