Skip to content

Rollup of 10 pull requests #53433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Aug 16, 2018
Merged

Rollup of 10 pull requests #53433

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d4b7c63
Documented impl From on line 367 of libserialize/json.rs
Ajacmac Aug 1, 2018
b70be5b
Adddressed #51602
PramodBisht Aug 14, 2018
352b2e7
Corrected typing description in doc
Ajacmac Aug 15, 2018
d305f68
Warn when `generic_associated_types` feature gate is enabled
varkor Aug 15, 2018
bc8cead
Account for warning in existing GAT tests
varkor Aug 15, 2018
e0d8364
std: Use target_pointer_width for BACKTRACE_ELF_SIZE
cuviper Aug 15, 2018
4cae665
Two small improvements
llogiq Aug 13, 2018
bbf0b15
Make core::sync::atomic::Ordering #[non_exhaustive]
varkor Aug 15, 2018
a502248
Make proc_macro Level #[non_exhaustive]
varkor Aug 15, 2018
ea505fd
Make std::io::Error #[non_exhaustive]
varkor Aug 15, 2018
f541ab2
Make cloudapi enums #[non_exhaustive]
varkor Aug 15, 2018
27f2a84
Remove outdated Unstable Book sections
varkor Aug 15, 2018
35a03c8
Tidy: ignore non-Markdown files when linting for the Unstable Book
varkor Aug 15, 2018
2a74d79
Tweak unclosed delimiter parser error
estebank Aug 15, 2018
1b5e29a
Do not emit "incorrect close delimiter" twice in the same place
estebank Aug 15, 2018
83268ff
syntax_ext: remove leftover span_err_if_not_stage0 macro.
eddyb Aug 15, 2018
494889e
Revert "Ignore test that fails on stage1"
eddyb Aug 15, 2018
c9274c7
fix broken test
estebank Aug 16, 2018
42efd27
Revert "Auto merge of #53134 - alexcrichton:tweak-travis, r=Mark-Simu…
kennytm Aug 9, 2018
53837db
Revert "Auto merge of #53035 - alexcrichton:debug-travis, r=kennytm"
kennytm Aug 9, 2018
b75f1ba
Revert "Use public DNS server instead of 169.254.169.254 on CI."
kennytm Aug 16, 2018
e7b65bd
enable more tests on stage1 again
RalfJung Aug 16, 2018
07ce2a3
Rollup merge of #52946 - Ajacmac:doc-impl-from, r=GuillaumeGomez
kennytm Aug 16, 2018
e606882
Rollup merge of #53313 - llogiq:two-small-improvements, r=estebank
kennytm Aug 16, 2018
1cda84b
Rollup merge of #53360 - PramodBisht:issue/51602, r=estebank
kennytm Aug 16, 2018
4968eea
Rollup merge of #53364 - varkor:gat-warn-broken, r=pnkfelix
kennytm Aug 16, 2018
098d80d
Rollup merge of #53373 - estebank:unclosed, r=petrochenkov
kennytm Aug 16, 2018
0c9e0e3
Rollup merge of #53377 - cuviper:pointer-elf_size, r=alexcrichton
kennytm Aug 16, 2018
6e98ed9
Rollup merge of #53395 - varkor:__Nonexhaustive-to-non_exhaustive, r=…
kennytm Aug 16, 2018
ae3ebf0
Rollup merge of #53399 - varkor:ignore-non-md-unstable_book, r=nikoma…
kennytm Aug 16, 2018
1cb13b2
Rollup merge of #53412 - eddyb:stage-who, r=alexcrichton
kennytm Aug 16, 2018
a68e61a
Rollup merge of #53234 - kennytm:debug-9696, r=alexcrichton
kennytm Aug 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
std: Use target_pointer_width for BACKTRACE_ELF_SIZE 
The former code used `target.contains("64")` to detect Elf64 targets,
but this is inaccurate in a few cases:

- `s390x-unknown-linux-gnu` is 64-bit
- `sparcv9-sun-solaris` is 64-bit
- `x86_64-unknown-linux-gnux32` is 32-bit

Instead the `std` build script can use `CARGO_CFG_TARGET_POINTER_WIDTH`
to reliably detect 64-bit targets for libbacktrace.

Also update to backtrace-sys 0.1.24 for rust-lang/backtrace-rs#122.
  • Loading branch information
@cuviper
cuviper committed Aug 15, 2018
commit e0d8364dadd404a37bc344ef089926745cfdbe20
6 changes: 3 additions & 3 deletions src/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ name = "backtrace"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"backtrace-sys 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
"backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
Expand All @@ -109,7 +109,7 @@ dependencies = [

[[package]]
name = "backtrace-sys"
version = "0.1.23"
version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -3100,7 +3100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum assert_cli 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98589b0e465a6c510d95fceebd365bb79bedece7f6e18a480897f2015f85ec51"
"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
"checksum backtrace-sys 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)" = "bff67d0c06556c0b8e6b5f090f0eac52d950d9dfd1d35ba04e4ca3543eaf6a7e"
"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
"checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789"
"checksum bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32"
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ fn build_libbacktrace(target: &str) -> Result<(), ()> {
} else {
build.file("../libbacktrace/elf.c");

if target.contains("64") {
let pointer_width = env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap();
if pointer_width == "64" {
build.define("BACKTRACE_ELF_SIZE", "64");
} else {
build.define("BACKTRACE_ELF_SIZE", "32");
Expand Down