Skip to content

Commit 185b9ac

Browse files
committed
Auto merge of #62961 - Centril:rollup-kydeswa, r=Centril
Rollup of 9 pull requests Successful merges: - #61727 (Add binary dependencies to dep-info files) - #62736 (Polonius: fix some cases of `killed` fact generation, and most of the `ui` test suite) - #62758 (ci: Install clang on Windows through tarballs) - #62784 (Add riscv32i-unknown-none-elf target) - #62814 (add support for hexagon-unknown-linux-musl) - #62827 (Don't link mcjit/interpreter LLVM components) - #62901 (cleanup: Remove `extern crate serialize as rustc_serialize`s) - #62903 (Support SDKROOT env var on iOS) - #62906 (Require a value for configure --debuginfo-level) Failed merges: - #62910 (cleanup: Remove lint annotations in specific crates that are already enforced by rustbuild) r? @ghost
2 parents 03f19f7 + 0340d72 commit 185b9ac

File tree

115 files changed

+1198
-229
lines changed

Some content is hidden

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

115 files changed

+1198
-229
lines changed

.azure-pipelines/steps/install-clang.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,18 @@ steps:
2626
#
2727
# Original downloaded here came from
2828
# http://releases.llvm.org/7.0.0/LLVM-7.0.0-win64.exe
29-
- script: |
30-
powershell -Command "$ProgressPreference = 'SilentlyContinue'; iwr -outf %TEMP%\LLVM-7.0.0-win64.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-7.0.0-win64.exe"
31-
set CLANG_DIR=%CD%\citools\clang-rust
32-
%TEMP%\LLVM-7.0.0-win64.exe /S /NCRC /D=%CLANG_DIR%
33-
set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=%CLANG_DIR%\bin\clang-cl.exe
34-
echo ##vso[task.setvariable variable=RUST_CONFIGURE_ARGS]%RUST_CONFIGURE_ARGS%
29+
# That installer was run through `wine` on Linux and then the resulting
30+
# installation directory (found in `$HOME/.wine/drive_c/Program Files/LLVM`) was
31+
# packaged up into a tarball. We've had issues otherwise that the installer will
32+
# randomly hang, provide not a lot of useful information, pollute global state,
33+
# etc. In general the tarball is just more confined and easier to deal with when
34+
# working with various CI environments.
35+
- bash: |
36+
set -e
37+
mkdir -p citools
38+
cd citools
39+
curl -f https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-7.0.0-win64.tar.gz | tar xzf -
40+
echo "##vso[task.setvariable variable=RUST_CONFIGURE_ARGS]$RUST_CONFIGURE_ARGS --set llvm.clang-cl=`pwd`/clang-rust/bin/clang-cl.exe"
3541
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
3642
displayName: Install clang (Windows)
3743

src/bootstrap/configure.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ def v(*args):
7676
o("llvm-assertions", "llvm.assertions", "build LLVM with assertions")
7777
o("debug-assertions", "rust.debug-assertions", "build with debugging assertions")
7878
o("llvm-release-debuginfo", "llvm.release-debuginfo", "build LLVM with debugger metadata")
79-
o("debuginfo-level", "rust.debuginfo-level", "debuginfo level for Rust code")
80-
o("debuginfo-level-rustc", "rust.debuginfo-level-rustc", "debuginfo level for the compiler")
81-
o("debuginfo-level-std", "rust.debuginfo-level-std", "debuginfo level for the standard library")
82-
o("debuginfo-level-tools", "rust.debuginfo-level-tools", "debuginfo level for the tools")
83-
o("debuginfo-level-tests", "rust.debuginfo-level-tests", "debuginfo level for the test suites run with compiletest")
79+
v("debuginfo-level", "rust.debuginfo-level", "debuginfo level for Rust code")
80+
v("debuginfo-level-rustc", "rust.debuginfo-level-rustc", "debuginfo level for the compiler")
81+
v("debuginfo-level-std", "rust.debuginfo-level-std", "debuginfo level for the standard library")
82+
v("debuginfo-level-tools", "rust.debuginfo-level-tools", "debuginfo level for the tools")
83+
v("debuginfo-level-tests", "rust.debuginfo-level-tests", "debuginfo level for the test suites run with compiletest")
8484
v("save-toolstates", "rust.save-toolstates", "save build and test status of external tools into this file")
8585

8686
v("prefix", "install.prefix", "set installation prefix")

src/ci/docker/dist-various-1/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ ENV TARGETS=$TARGETS,thumbv7em-none-eabihf
112112
ENV TARGETS=$TARGETS,thumbv8m.base-none-eabi
113113
ENV TARGETS=$TARGETS,thumbv8m.main-none-eabi
114114
ENV TARGETS=$TARGETS,thumbv8m.main-none-eabihf
115+
ENV TARGETS=$TARGETS,riscv32i-unknown-none-elf
115116
ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf
116117
ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
117118
ENV TARGETS=$TARGETS,riscv64imac-unknown-none-elf

src/ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
5050
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
5151
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
5252
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.remap-debuginfo"
53-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.debuginfo-level-std=1"
53+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --debuginfo-level-std=1"
5454

5555
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
5656
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"

src/libcore/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
#![feature(cmpxchg16b_target_feature)]
121121
#![feature(rtm_target_feature)]
122122
#![feature(f16c_target_feature)]
123+
#![feature(hexagon_target_feature)]
123124
#![feature(const_slice_len)]
124125
#![feature(const_str_as_bytes)]
125126
#![feature(const_str_len)]

src/libpanic_unwind/gcc.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ const UNWIND_DATA_REG: (i32, i32) = (6, 7); // R6, R7
126126
#[cfg(target_arch = "sparc64")]
127127
const UNWIND_DATA_REG: (i32, i32) = (24, 25); // I0, I1
128128

129+
#[cfg(target_arch = "hexagon")]
130+
const UNWIND_DATA_REG: (i32, i32) = (0, 1); // R0, R1
131+
129132
// The following code is based on GCC's C and C++ personality routines. For reference, see:
130133
// https://github.com/gcc-mirror/gcc/blob/master/libstdc++-v3/libsupc++/eh_personality.cc
131134
// https://github.com/gcc-mirror/gcc/blob/trunk/libgcc/unwind-c.c

src/librustc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ rustc_target = { path = "../librustc_target" }
2727
rustc_macros = { path = "../librustc_macros" }
2828
rustc_data_structures = { path = "../librustc_data_structures" }
2929
errors = { path = "../librustc_errors", package = "rustc_errors" }
30-
serialize = { path = "../libserialize" }
30+
rustc_serialize = { path = "../libserialize", package = "serialize" }
3131
syntax = { path = "../libsyntax" }
3232
syntax_pos = { path = "../libsyntax_pos" }
3333
backtrace = "0.3.3"

src/librustc/hir/def_id.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::ty::{self, TyCtxt};
22
use crate::hir::map::definitions::FIRST_FREE_DEF_INDEX;
33
use rustc_data_structures::indexed_vec::Idx;
4-
use serialize;
54
use std::fmt;
65
use std::u32;
76

@@ -93,8 +92,8 @@ impl fmt::Display for CrateNum {
9392
}
9493
}
9594

96-
impl serialize::UseSpecializedEncodable for CrateNum {}
97-
impl serialize::UseSpecializedDecodable for CrateNum {}
95+
impl rustc_serialize::UseSpecializedEncodable for CrateNum {}
96+
impl rustc_serialize::UseSpecializedDecodable for CrateNum {}
9897

9998
newtype_index! {
10099
/// A DefIndex is an index into the hir-map for a crate, identifying a
@@ -134,8 +133,8 @@ impl DefIndex {
134133
}
135134
}
136135

137-
impl serialize::UseSpecializedEncodable for DefIndex {}
138-
impl serialize::UseSpecializedDecodable for DefIndex {}
136+
impl rustc_serialize::UseSpecializedEncodable for DefIndex {}
137+
impl rustc_serialize::UseSpecializedDecodable for DefIndex {}
139138

140139
/// A `DefId` identifies a particular *definition*, by combining a crate
141140
/// index and a def index.
@@ -186,8 +185,8 @@ impl DefId {
186185
}
187186
}
188187

189-
impl serialize::UseSpecializedEncodable for DefId {}
190-
impl serialize::UseSpecializedDecodable for DefId {}
188+
impl rustc_serialize::UseSpecializedEncodable for DefId {}
189+
impl rustc_serialize::UseSpecializedDecodable for DefId {}
191190

192191
/// A LocalDefId is equivalent to a DefId with `krate == LOCAL_CRATE`. Since
193192
/// we encode this information in the type, we can ensure at compile time that
@@ -220,5 +219,5 @@ impl fmt::Debug for LocalDefId {
220219
}
221220
}
222221

223-
impl serialize::UseSpecializedEncodable for LocalDefId {}
224-
impl serialize::UseSpecializedDecodable for LocalDefId {}
222+
impl rustc_serialize::UseSpecializedEncodable for LocalDefId {}
223+
impl rustc_serialize::UseSpecializedDecodable for LocalDefId {}

src/librustc/hir/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use rustc_data_structures::sync::{par_for_each_in, Send, Sync};
3434
use rustc_data_structures::thin_vec::ThinVec;
3535
use rustc_macros::HashStable;
3636

37-
use serialize::{self, Encoder, Encodable, Decoder, Decodable};
37+
use rustc_serialize::{self, Encoder, Encodable, Decoder, Decodable};
3838
use std::collections::{BTreeSet, BTreeMap};
3939
use std::fmt;
4040
use smallvec::SmallVec;
@@ -92,7 +92,7 @@ impl HirId {
9292
}
9393
}
9494

95-
impl serialize::UseSpecializedEncodable for HirId {
95+
impl rustc_serialize::UseSpecializedEncodable for HirId {
9696
fn default_encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
9797
let HirId {
9898
owner,
@@ -104,7 +104,7 @@ impl serialize::UseSpecializedEncodable for HirId {
104104
}
105105
}
106106

107-
impl serialize::UseSpecializedDecodable for HirId {
107+
impl rustc_serialize::UseSpecializedDecodable for HirId {
108108
fn default_decode<D: Decoder>(d: &mut D) -> Result<HirId, D::Error> {
109109
let owner = DefIndex::decode(d)?;
110110
let local_id = ItemLocalId::decode(d)?;

src/librustc/hir/ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::iter::FromIterator;
77
use std::ops::Deref;
88
use std::{slice, vec};
99

10-
use serialize::{Encodable, Decodable, Encoder, Decoder};
10+
use rustc_serialize::{Encodable, Decodable, Encoder, Decoder};
1111

1212
use rustc_data_structures::stable_hasher::{StableHasher, StableHasherResult,
1313
HashStable};

0 commit comments

Comments
 (0)