Skip to content

Commit 48af771

Browse files
borsbors
committed
Auto merge of #51717 - Mark-Simulacrum:snap, r=alexcrichton
Bootstrap from 1.28.0 beta
2 parents 74c89b0 + 3d68774 commit 48af771

File tree

24 files changed

+56
-345
lines changed

24 files changed

+56
-345
lines changed

‎src/Cargo.lock

+15-14
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
191191

192192
[[package]]
193193
name = "cargo"
194-
version = "0.29.0"
194+
version = "0.30.0"
195195
dependencies = [
196196
"atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
197197
"bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
198198
"clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)",
199199
"core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
200-
"crates-io 0.17.0",
200+
"crates-io 0.18.0",
201201
"crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
202202
"crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
203203
"curl 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -232,6 +232,7 @@ dependencies = [
232232
"tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
233233
"termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
234234
"toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
235+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
235236
"url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
236237
"winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
237238
]
@@ -299,7 +300,7 @@ dependencies = [
299300
"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
300301
"strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
301302
"textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
302-
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
303+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
303304
"vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
304305
"yaml-rust 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
305306
]
@@ -472,7 +473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
472473

473474
[[package]]
474475
name = "crates-io"
475-
version = "0.17.0"
476+
version = "0.18.0"
476477
dependencies = [
477478
"curl 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
478479
"failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1683,7 +1684,7 @@ dependencies = [
16831684
name = "rls"
16841685
version = "0.128.0"
16851686
dependencies = [
1686-
"cargo 0.29.0",
1687+
"cargo 0.30.0",
16871688
"cargo_metadata 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
16881689
"clippy_lints 0.0.205 (registry+https://github.com/rust-lang/crates.io-index)",
16891690
"env_logger 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1882,7 +1883,7 @@ dependencies = [
18821883
"rustc-ap-serialize 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
18831884
"rustc-ap-syntax_pos 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
18841885
"termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
1885-
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
1886+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
18861887
]
18871888

18881889
[[package]]
@@ -1895,7 +1896,7 @@ dependencies = [
18951896
"rustc-ap-serialize 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
18961897
"rustc-ap-syntax_pos 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
18971898
"termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
1898-
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
1899+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
18991900
]
19001901

19011902
[[package]]
@@ -1969,7 +1970,7 @@ dependencies = [
19691970
"rustc-ap-rustc_data_structures 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
19701971
"rustc-ap-serialize 149.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
19711972
"scoped-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
1972-
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
1973+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
19731974
]
19741975

19751976
[[package]]
@@ -1981,7 +1982,7 @@ dependencies = [
19811982
"rustc-ap-rustc_data_structures 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
19821983
"rustc-ap-serialize 164.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
19831984
"scoped-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
1984-
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
1985+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
19851986
]
19861987

19871988
[[package]]
@@ -2192,7 +2193,7 @@ dependencies = [
21922193
"serialize 0.0.0",
21932194
"syntax_pos 0.0.0",
21942195
"termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
2195-
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
2196+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
21962197
]
21972198

21982199
[[package]]
@@ -2783,7 +2784,7 @@ dependencies = [
27832784
"rustc_data_structures 0.0.0",
27842785
"scoped-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
27852786
"serialize 0.0.0",
2786-
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
2787+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
27872788
]
27882789

27892790
[[package]]
@@ -2908,7 +2909,7 @@ name = "textwrap"
29082909
version = "0.9.0"
29092910
source = "registry+https://github.com/rust-lang/crates.io-index"
29102911
dependencies = [
2911-
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
2912+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
29122913
]
29132914

29142915
[[package]]
@@ -2984,7 +2985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
29842985

29852986
[[package]]
29862987
name = "unicode-width"
2987-
version = "0.1.4"
2988+
version = "0.1.5"
29882989
source = "registry+https://github.com/rust-lang/crates.io-index"
29892990

29902991
[[package]]
@@ -3388,7 +3389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
33883389
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
33893390
"checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
33903391
"checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946"
3391-
"checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
3392+
"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
33923393
"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
33933394
"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
33943395
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"

‎src/bootstrap/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use Build;
2424
use config::Config;
2525

2626
// The version number
27-
pub const CFG_RELEASE_NUM: &str = "1.28.0";
27+
pub const CFG_RELEASE_NUM: &str = "1.29.0";
2828

2929
pub struct GitInfo {
3030
inner: Option<Info>,

‎src/bootstrap/compile.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1049,22 +1049,22 @@ pub fn run_cargo(builder: &Builder, cargo: &mut Command, stamp: &Path, is_check:
10491049
!filename.ends_with(".lib") &&
10501050
!is_dylib(&filename) &&
10511051
!(is_check && filename.ends_with(".rmeta")) {
1052-
return;
1052+
continue;
10531053
}
10541054

10551055
let filename = Path::new(&*filename);
10561056

10571057
// If this was an output file in the "host dir" we don't actually
10581058
// worry about it, it's not relevant for us.
10591059
if filename.starts_with(&host_root_dir) {
1060-
return;
1060+
continue;
10611061
}
10621062

10631063
// If this was output in the `deps` dir then this is a precise file
10641064
// name (hash included) so we start tracking it.
10651065
if filename.starts_with(&target_deps_dir) {
10661066
deps.push(filename.to_path_buf());
1067-
return;
1067+
continue;
10681068
}
10691069

10701070
// Otherwise this was a "top level artifact" which right now doesn't

‎src/liballoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
#![feature(pin)]
106106
#![feature(ptr_internals)]
107107
#![feature(ptr_offset_from)]
108-
#![cfg_attr(stage0, feature(repr_transparent))]
109108
#![feature(rustc_attrs)]
110109
#![feature(specialization)]
111110
#![feature(split_ascii_whitespace)]

‎src/libcore/intrinsics.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1364,10 +1364,6 @@ extern "rust-intrinsic" {
13641364
/// source as well as std's catch implementation.
13651365
pub fn try(f: fn(*mut u8), data: *mut u8, local_ptr: *mut u8) -> i32;
13661366

1367-
#[cfg(stage0)]
1368-
/// docs my friends, its friday!
1369-
pub fn align_offset(ptr: *const (), align: usize) -> usize;
1370-
13711367
/// Emits a `!nontemporal` store according to LLVM (see their docs).
13721368
/// Probably will never become stable.
13731369
pub fn nontemporal_store<T>(ptr: *mut T, val: T);

‎src/libcore/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
#![feature(optin_builtin_traits)]
101101
#![feature(prelude_import)]
102102
#![feature(repr_simd, platform_intrinsics)]
103-
#![cfg_attr(stage0, feature(repr_transparent))]
104103
#![feature(rustc_attrs)]
105104
#![feature(rustc_const_unstable)]
106105
#![feature(simd_ffi)]

0 commit comments

Comments
 (0)