-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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 7 pull requests #60435
Rollup of 7 pull requests #60435
Conversation
If we have a borrow that has to live for `'static` we need to check for any regions in incompatible universes when trying to find the cause.
Use references for variances_of Based on rust-lang#60280. cc @varkor r? @eddyb
…-lbl, r=nikomatsakis Search for incompatible universes in borrow errors If we have a borrow that has to live for `'static` we need to check for any regions in incompatible universes when trying to find the cause. closes rust-lang#60274
…, r=estebank Suggest using an inclusive range instead of an exclusive range when the endpoint overflows by 1 Fixes rust-lang#47213.
build-gcc: Create missing cc symlink This PR mostly fixes build error caused by using rustc docker images to build [rustup][1] (with the error: ``linker `cc` not found``). I don't know why gcc build script doesn't install cc hard link by default. In build log, with `make SHELL='sh -x' install`, gcc build script installs c++ hard link but not `cc` one: ```bash if test "" != "yes" ; then \ rm -f /rustroot/bin/g++; \ /usr/bin/install -c xg++ /rustroot/bin/g++; \ chmod a+x /rustroot/bin/g++; \ rm -f /rustroot/bin/c++; \ ( cd /rustroot/bin && \ ln g++ c++ ); \ if [ -f cc1plus ] ; then \ if [ ! -f g++-cross ] ; then \ rm -f /rustroot/bin/x86_64-unknown-linux-gnu-g++; \ ( cd /rustroot/bin && \ ln g++ x86_64-unknown-linux-gnu-g++ ); \ rm -f /rustroot/bin/x86_64-unknown-linux-gnu-c++; \ ( cd /rustroot/bin && \ ln c++ x86_64-unknown-linux-gnu-c++ ); \ fi ; \ fi; \ fi ``` This might be fixed downstream by manually creating cc hard link or setting `RUSTFLAGS="-C linker=gcc"` as [suggested by @mati865][2]. But I find it better to fix it upstream in this PR. [1]: rust-lang/rustup#1815 [2]: rust-lang/rustup#1815 (comment)
Support ZSTs in DispatchFromDyn Allows to use ZSTs with 1 byte alignment in `DispatchFromDyn` implementation. This is required for `Box<T, A: Alloc>` cc rust-lang#58457
…ackler Implement `BorrowMut<str>` for `String` Closes rust-lang/rfcs#1282.
…-drop-temps, r=oli-obk Rename hir::ExprKind::Use to ::DropTemps and improve docs. Addresses rust-lang#60225 (comment). r? @oli-obk cc @eddyb @Manishearth
@bors r+ p=8 |
📌 Commit e5b6997 has been approved by |
⌛ Testing commit e5b6997 with merge fa13ddbdde52a64e4b5a7be039a933546c15f976... |
💔 Test failed - checks-travis |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
@bors retry |
⌛ Testing commit e5b6997 with merge 169da6f8277abc1f84411e5fbeee3e8cc380bcff... |
💔 Test failed - checks-travis |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
spurious network error? |
@bors retry |
Rollup of 7 pull requests Successful merges: - #60287 (Use references for variances_of) - #60327 (Search for incompatible universes in borrow errors) - #60330 (Suggest using an inclusive range instead of an exclusive range when the endpoint overflows by 1) - #60366 (build-gcc: Create missing cc symlink) - #60369 (Support ZSTs in DispatchFromDyn) - #60404 (Implement `BorrowMut<str>` for `String`) - #60417 (Rename hir::ExprKind::Use to ::DropTemps and improve docs.) Failed merges: r? @ghost
☀️ Test successful - checks-travis, status-appveyor |
📣 Toolstate changed by #60435! Tested on commit 9b67bd4. 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). |
Tested on commit rust-lang/rust@9b67bd4. Direct link to PR: <rust-lang/rust#60435> 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 💔 rls on windows: test-fail → build-fail (cc @Xanewok, @rust-lang/infra). 💔 rls on linux: test-fail → build-fail (cc @Xanewok, @rust-lang/infra). 💔 edition-guide on windows: test-pass → test-fail (cc @ehuss @Centril @steveklabnik, @rust-lang/infra). 💔 edition-guide on linux: test-pass → test-fail (cc @ehuss @Centril @steveklabnik, @rust-lang/infra).
@ehuss Can you take a look at the edition guide test failure perhaps? |
@Centril @varkor I don't fully understand #60330. The following example: fn takes_u8(x: u8) {
// ...
}
fn main() {
for i in 0..256 {
println!("i: {}", i);
takes_u8(i);
}
} Previously it was an error (literal out of range). On latest master, it builds, but produces no output. Removing the call to |
@ehuss: that shouldn't build. It should produce the same error as before, but with an additional instruction. I'll investigate.
Because without specifying that the integer is |
I've opened up #60459 specifically for this issue. Thanks for spotting it. |
Successful merges:
BorrowMut<str>
forString
#60404 (ImplementBorrowMut<str>
forString
)Failed merges:
r? @ghost