Skip to content

Commit 636a05b

Browse files
committed
---
yaml --- r: 207741 b: refs/heads/snap-stage3 c: 247842b h: refs/heads/master i: 207739: 0394c90 v: v3
1 parent ab96d4d commit 636a05b

File tree

9 files changed

+19
-15
lines changed

9 files changed

+19
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 60f8f6bde9be62554a850c31c770357e7d3e576e
4+
refs/heads/snap-stage3: 247842b741db380fbd0e0d73f37e86f6c561ca9d
55
refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/mk/rt.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ $$(RT_OUTPUT_DIR_$(1))/$$(NATIVE_$(2)_$(1)): $$(OBJS_$(2)_$(1))
113113

114114
ifeq ($$(findstring windows,$(1)),windows)
115115
$$(RT_OUTPUT_DIR_$(1))/lib$(2).a: $$(RT_OUTPUT_DIR_$(1))/$$(NATIVE_$(2)_$(1))
116-
$$(Q)cp $$< $$^
116+
$$(Q)cp $$^ $$@
117117
endif
118118

119119
endef
@@ -227,7 +227,7 @@ COMPRT_DEPS := $(wildcard \
227227
$(S)src/compiler-rt/*/*/*/*)
228228
endif
229229

230-
COMPRT_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),compiler-rt)
230+
COMPRT_NAME_$(1) := libcompiler-rt.a
231231
COMPRT_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(COMPRT_NAME_$(1))
232232
COMPRT_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/compiler-rt
233233

branches/snap-stage3/src/test/bench/noise.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ impl Noise2DContext {
101101

102102
fn main() {
103103
let symbols = [' ', '░', '▒', '▓', '█', '█'];
104-
let mut pixels = [0f32; 256*256];
105-
let n2d = Noise2DContext::new();
104+
let mut pixels = Box::new([0f32; 256*256]);
105+
let n2d = Box::new(Noise2DContext::new());
106106

107107
for _ in 0..100 {
108108
for y in 0..256 {

branches/snap-stage3/src/test/bench/shootout-reverse-complement.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ use std::ptr::copy;
5050
use std::thread;
5151

5252
struct Tables {
53-
table8: [u8; 1 << 8],
54-
table16: [u16; 1 << 16]
53+
table8: Box<[u8; 1 << 8]>,
54+
table16: Box<[u16; 1 << 16]>,
5555
}
5656

5757
impl Tables {
5858
fn new() -> Tables {
59-
let mut table8 = [0;1 << 8];
59+
let mut table8 = Box::new([0;1 << 8]);
6060
for (i, v) in table8.iter_mut().enumerate() {
6161
*v = Tables::computed_cpl8(i as u8);
6262
}
63-
let mut table16 = [0;1 << 16];
63+
let mut table16 = Box::new([0;1 << 16]);
6464
for (i, v) in table16.iter_mut().enumerate() {
6565
*v = (table8[i & 255] as u16) << 8 |
6666
table8[i >> 8] as u16;

branches/snap-stage3/src/test/run-pass-fulldeps/issue-13560.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// aux-build:issue-13560-2.rs
1313
// aux-build:issue-13560-3.rs
1414
// ignore-stage1
15+
// ignore-musl
1516

1617
// Regression test for issue #13560, the test itself is all in the dependent
1718
// libraries. The fail which previously failed to compile is the one numbered 3.

branches/snap-stage3/src/test/run-pass/issue-12133-3.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// aux-build:issue-12133-rlib.rs
1212
// aux-build:issue-12133-dylib.rs
1313
// aux-build:issue-12133-dylib2.rs
14+
// ignore-musl
1415

1516
// pretty-expanded FIXME #23616
1617

branches/snap-stage3/src/test/run-pass/linkage-visibility.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// aux-build:linkage-visibility.rs
1212
// ignore-android: FIXME(#10379)
1313
// ignore-windows: std::dynamic_lib does not work on Windows well
14+
// ignore-musl
1415

1516
#![feature(std_misc)]
1617

branches/snap-stage3/src/test/run-pass/out-of-stack-new-thread-no-split.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
//ignore-android
12-
//ignore-freebsd
13-
//ignore-ios
14-
//ignore-dragonfly
15-
//ignore-bitrig
11+
// ignore-android
12+
// ignore-freebsd
13+
// ignore-ios
14+
// ignore-dragonfly
15+
// ignore-bitrig
16+
// ignore-musl
1617

1718
#![feature(asm)]
1819

branches/snap-stage3/src/test/run-pass/sepcomp-extern.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
// Test accessing external items from multiple compilation units.
1616

17+
extern crate sepcomp_extern_lib;
1718

18-
#[link(name = "sepcomp_extern_lib")]
1919
extern {
2020
#[allow(ctypes)]
2121
fn foo() -> usize;

0 commit comments

Comments
 (0)