Skip to content
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.

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

Rollup of 9 pull requests #74155

Closed
wants to merge 18 commits into from

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 18 commits July 3, 2020 13:22
This pulls in a fix for the install script on some tr(1) implementations,
as well as an update to use `anyhow` instead of `failure` for error
handling.
Keep congruency with other parts, full word vector is rarely used.
When cross-compiling, the LLVM build system recurses to build tools
that need to run on the host system. However, since we pass cmake defines
to set the compiler and target, LLVM still compiles these tools for the
target system, rather than the host. The tools then fail to execute
during the LLVM build.

This change sets defines for the tools that need to run on the
host (llvm-nm, llvm-tablegen, and llvm-config), so that the LLVM build
does not attempt to build them, and instead relies on the tools already built.

If compiling with clang-cl, this change also adds the `--target` option
to specify the target triple. MSVC compilers do not require this, since there
is a separate compiler binary for cross-compilation.
adjust ub-enum test to be endianess-independent

@cuviper noted that our test fails on "other" endianess systems (I never know which is which^^), so let's fix that.
Fix cross compilation of LLVM to aarch64 Windows targets

When cross-compiling, the LLVM build system recurses to build tools that need to run on the host system. However, since we pass cmake defines to set the compiler and target, LLVM still compiles these tools for the target system, rather than the host. The tools then fail to execute during the LLVM build.

This change sets defines for the tools that need to run on the host (llvm-nm, llvm-tablegen, and llvm-config), so that the LLVM build does not attempt to build them, and instead relies on the tools already built.

If compiling with clang-cl, adds the `--target` option to specify the target triple. MSVC compilers do not require this, since there is a separate compiler binary for each cross-compilation target.

Related issue: rust-lang#72881
Requires LLVM change: rust-lang/llvm-project#67
…ttributes_name, r=GuillaumeGomez

rustdoc: Rename invalid_codeblock_attribute lint to be plural

Lint names should be plural as per the lint naming conventions: https://github.com/rust-lang/rfcs/blob/master/text/0344-conventions-galore.md#lints

r? @GuillaumeGomez
Update books

## book

3 commits in 4e7c00bece1544d409312ec93467beb62b5bd0cb..84a31397b34f9d405df44f2899ff17a4828dba18
2020-06-19 09:39:12 -0400 to 2020-07-04 10:50:18 -0500
- Update Windows install instructions (rust-lang/book#2389)
- Update ch01-02-hello-world.md (rust-lang/book#2386)
- bump mdbook version in github action (rust-lang/book#2380)

## reference

2 commits in 04d5d5d7ba624b6f5016298451f3a63d557f3260..0ea7bc494f1289234d8800bb9185021e0ad946f0
2020-06-16 15:08:05 -0700 to 2020-07-02 15:33:04 -0700
- Fix mis-capitalization of type name. (rust-lang/reference#844)
- Fix name of trait for array indexing. (rust-lang/reference#840)

## embedded-book

1 commits in 616962ad0dd80f34d8b802da038d0aed9dd691bb..94d9ea8460bcbbbfef1877b47cb930260b5849a7
2020-06-23 16:03:45 +0000 to 2020-07-05 14:17:40 +0000
- Note on transformation of static variables by attribute exception  (rust-embedded/book#251)

## rust-by-example

1 commits in 6f94ccb48da6fa4ed0031290f21411cf789f7d5e..229c6945a26a53a751ffa4f9cb418388c00029d3
2020-06-20 17:51:30 -0300 to 2020-07-06 10:13:15 -0300
- Modify comments (rust-lang/rust-by-example#1359)
…umeGomez

Fix broken link in rustdocdoc

The previous link redirects to https://www.rust-lang.org/learn.
Liballoc use vec instead of vector

Keep congruency with other parts, full word vector is rarely used.
Try remove unneeded ToString import in liballoc slice
…k-Simulacrum

Update rust-installer to latest version

This pulls in a fix for the install script on some tr(1) implementations,
as well as an update to use `anyhow` instead of `failure` for error
handling.
@Manishearth
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jul 8, 2020

📌 Commit be0e874 has been approved by Manishearth

@rustbot rustbot added the rollup A PR which is a rollup label Jul 8, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 8, 2020
@bors
Copy link
Contributor

bors commented Jul 8, 2020

⌛ Testing commit be0e874 with merge 4af9d278e85e2cb73f04b74d51b163e43ccd7122...

@bors
Copy link
Contributor

bors commented Jul 8, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 8, 2020
@Manishearth
Copy link
Member Author

2020-07-08T17:36:12.9399991Z �[0m�[0m�[1m�[32m    Finished�[0m release [optimized] target(s) in 6.91s
2020-07-08T17:36:12.9795029Z �[0m�[0m�[1m�[32m     Running�[0m `build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\cargo-miri.exe miri setup`
2020-07-08T17:36:13.2063128Z error: Cargo.lock file is missing from source dir
2020-07-08T17:36:13.2064255Z caused by: The filename, directory name, or volume label syntax is incorrect. (os error 123)
2020-07-08T17:36:13.2065139Z    0: backtrace::backtrace::trace
2020-07-08T17:36:13.2065414Z    1: backtrace::capture::Backtrace::new
2020-07-08T17:36:13.2065656Z    2: error_chain::make_backtrace
2020-07-08T17:36:13.2065918Z    3: <core::result::Result<T,E> as xargo::errors::ResultExt<T,E>>::chain_err
2020-07-08T17:36:13.2067011Z    4: alloc::raw_vec::RawVec<T,A>::reserve
2020-07-08T17:36:13.2067250Z    5: xargo::sysroot::update
2020-07-08T17:36:13.2067477Z    6: xargo::main_inner
2020-07-08T17:36:13.2067645Z    7: _cflush
2020-07-08T17:36:13.2067828Z    8: std::rt::lang_start_internal
2020-07-08T17:36:13.2067993Z    9: main
2020-07-08T17:36:13.2068617Z   10: invoke_main
2020-07-08T17:36:13.2068823Z              at d:\A01\_work\6\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:78
2020-07-08T17:36:13.2069025Z   11: __scrt_common_main_seh
2020-07-08T17:36:13.2069299Z              at d:\A01\_work\6\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl:288
2020-07-08T17:36:13.2069492Z   12: BaseThreadInitThunk
2020-07-08T17:36:13.2069662Z   13: RtlUserThreadStart
2020-07-08T17:36:13.2069779Z 
2020-07-08T17:36:13.2106009Z fatal error: Failed to run xargo
2020-07-08T17:36:13.2149621Z �[0m�[0m�[1m�[31merror�[0m�[1m:�[0m process didn't exit successfully: `build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\cargo-miri.exe miri setup` (exit code: 1)

@Manishearth Manishearth closed this Jul 8, 2020
@Manishearth Manishearth mentioned this pull request Jul 8, 2020
@Manishearth Manishearth deleted the rollup-af8x256 branch July 9, 2020 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants