Skip to content

Commit 05578d7

Browse files
committed
---
yaml --- r: 194965 b: refs/heads/beta c: 02c6f6b h: refs/heads/master i: 194963: 650224e v: v3
1 parent 55313cb commit 05578d7

File tree

8 files changed

+9
-19
lines changed

8 files changed

+9
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 27901849e07558639b8decc03707e0317ae8280e
34+
refs/heads/beta: 02c6f6b04928480d302f25520a5c06d55e91eaf8
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: be7f6ac7008f8ddf980ac07026b05bdd865f29cc

branches/beta/mk/tests.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -569,11 +569,6 @@ ifeq ($(CFG_OSTYPE),apple-darwin)
569569
CTEST_DISABLE_debuginfo-gdb = "gdb on darwin needs root"
570570
endif
571571

572-
ifeq ($(findstring android, $(CFG_TARGET)), android)
573-
CTEST_DISABLE_debuginfo-gdb =
574-
CTEST_DISABLE_debuginfo-lldb = "lldb tests are disabled on android"
575-
endif
576-
577572
# CTEST_DISABLE_NONSELFHOST_$(TEST_GROUP), if set, will cause that
578573
# test group to be disabled *unless* the target is able to build a
579574
# compiler (i.e. when the target triple is in the set of of host

branches/beta/src/libcore/ops.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -995,10 +995,8 @@ impl fmt::Debug for RangeFull {
995995
#[stable(feature = "rust1", since = "1.0.0")]
996996
pub struct Range<Idx> {
997997
/// The lower bound of the range (inclusive).
998-
#[stable(feature = "rust1", since = "1.0.0")]
999998
pub start: Idx,
1000999
/// The upper bound of the range (exclusive).
1001-
#[stable(feature = "rust1", since = "1.0.0")]
10021000
pub end: Idx,
10031001
}
10041002

@@ -1015,10 +1013,11 @@ impl<Idx: fmt::Debug> fmt::Debug for Range<Idx> {
10151013
#[stable(feature = "rust1", since = "1.0.0")]
10161014
pub struct RangeFrom<Idx> {
10171015
/// The lower bound of the range (inclusive).
1018-
#[stable(feature = "rust1", since = "1.0.0")]
10191016
pub start: Idx,
10201017
}
10211018

1019+
1020+
10221021
#[stable(feature = "rust1", since = "1.0.0")]
10231022
impl<Idx: fmt::Debug> fmt::Debug for RangeFrom<Idx> {
10241023
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
@@ -1032,7 +1031,6 @@ impl<Idx: fmt::Debug> fmt::Debug for RangeFrom<Idx> {
10321031
#[stable(feature = "rust1", since = "1.0.0")]
10331032
pub struct RangeTo<Idx> {
10341033
/// The upper bound of the range (exclusive).
1035-
#[stable(feature = "rust1", since = "1.0.0")]
10361034
pub end: Idx,
10371035
}
10381036

@@ -1043,6 +1041,7 @@ impl<Idx: fmt::Debug> fmt::Debug for RangeTo<Idx> {
10431041
}
10441042
}
10451043

1044+
10461045
/// The `Deref` trait is used to specify the functionality of dereferencing
10471046
/// operations like `*v`.
10481047
///

branches/beta/src/libstd/process.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ mod tests {
748748
cmd
749749
}
750750

751-
#[cfg(not(target_arch = "aarch64"))]
752751
#[test]
753752
fn test_keep_current_working_dir() {
754753
use os;

branches/beta/src/test/debuginfo/c-style-enum.rs

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

11-
// ignore-aarch64
1211
// min-lldb-version: 310
1312

1413
// compile-flags:-g

branches/beta/src/test/debuginfo/issue12886.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010

1111
// ignore-windows failing on 64-bit bots FIXME #17638
1212
// ignore-lldb
13-
// ignore-aarch64
1413

1514
// compile-flags:-g
1615

1716
// gdb-command:run
1817
// gdb-command:next
19-
// gdb-check:[...]34[...]s
18+
// gdb-check:[...]33[...]s
2019
// gdb-command:continue
2120

2221
#![omit_gdb_pretty_printer_section]

branches/beta/src/test/run-pass/extern-call-deep2.rs

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

11-
#![feature(std_misc, libc)]
11+
#![feature(libc)]
1212

1313
extern crate libc;
14-
use std::thread::Thread;
14+
use std::thread;
1515

1616
mod rustrt {
1717
extern crate libc;
@@ -42,9 +42,9 @@ fn count(n: libc::uintptr_t) -> libc::uintptr_t {
4242
pub fn main() {
4343
// Make sure we're on a task with small Rust stacks (main currently
4444
// has a large stack)
45-
let _t = Thread::spawn(move|| {
45+
thread::scoped(move|| {
4646
let result = count(1000);
4747
println!("result = {}", result);
4848
assert_eq!(result, 1000);
49-
});
49+
}).join();
5050
}

branches/beta/src/test/run-pass/sigpipe-should-be-ignored.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// Be sure that when a SIGPIPE would have been received that the entire process
1212
// doesn't die in a ball of fire, but rather it's gracefully handled.
1313

14-
// ignore-aarch64
1514
// pretty-expanded FIXME #23616
1615

1716
use std::env;

0 commit comments

Comments
 (0)