Skip to content

Commit 3cfad97

Browse files
committed
---
yaml --- r: 95710 b: refs/heads/dist-snap c: 0e6a575 h: refs/heads/master v: v3
1 parent a0bc7f4 commit 3cfad97

Some content is hidden

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

82 files changed

+4080
-3093
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 2ab4a6fab046769ddad48de557f64b0a97f86ce3
9+
refs/heads/dist-snap: 0e6a575635862deba5c280d38b32bb43093980c0
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/mk/rt.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ RUNTIME_CXXS_$(1)_$(2) := \
8989
rt/rust_upcall.cpp \
9090
rt/rust_uv.cpp \
9191
rt/miniz.cpp \
92+
rt/memory_region.cpp \
93+
rt/boxed_region.cpp \
9294
rt/rust_android_dummy.cpp \
9395
rt/rust_test_helpers.cpp
9496

branches/dist-snap/src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use util::logv;
2323
use std::cell::Cell;
2424
use std::rt::io;
2525
use std::rt::io::Writer;
26-
use std::rt::io::Reader;
26+
use std::rt::io::extensions::ReaderUtil;
2727
use std::rt::io::file::FileInfo;
2828
use std::os;
2929
use std::str;

branches/dist-snap/src/etc/licenseck.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@
7676
"rt/isaac/randport.cpp", # public domain
7777
"rt/isaac/rand.h", # public domain
7878
"rt/isaac/standard.h", # public domain
79-
"libstd/rt/mpsc_queue.rs", # BSD
80-
"libstd/rt/mpmc_bounded_queue.rs", # BSD
8179
]
8280

8381
def check_license(name, contents):

0 commit comments

Comments
 (0)