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 7 pull requests #73972

Closed
wants to merge 19 commits into from

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

mark-i-m and others added 19 commits June 17, 2020 14:25
This new version includes a fix for building on aarch64 windows.
WebAssembly supports saturating floating point to integer casts behind a
target feature. The feature is already available on many browsers.
Beginning with 1.45 Rust will start defining the behavior of floating
point to integer casts to be saturating as well. For this Rust
constructs additional checks on top of the `fptoui` / `fptosi`
instructions it emits. Here we introduce the possibility for the codegen
backend to construct saturating casts itself and only fall back to
constructing the checks ourselves if that is not possible.
This commit modifies resolve to disallow `break`/`continue` to labels
through closures or async blocks. This doesn't make sense and should
have been prohibited anyway.

Signed-off-by: David Wood <[email protected]>
Move contributing.md to rustc-dev-guide and point at getting started

See description on rust-lang/rustc-dev-guide#753
…crichton

Use WASM's saturating casts if they are available

WebAssembly supports saturating floating point to integer casts behind a target feature. The feature is already available on many browsers. Beginning with 1.45 Rust will start defining the behavior of floating point to integer casts to be saturating as well. For this Rust constructs additional checks on top of the `fptoui` / `fptosi` instructions it emits. Here we introduce the possibility for the codegen backend to construct saturating casts itself and only fall back to constructing the checks ourselves if that is not possible.

Resolves part of rust-lang#73591
…k-through-closure-async, r=petrochenkov

resolve: disallow labelled breaks/continues through closures/async blocks

Fixes rust-lang#73541.

This PR modifies name resolution to prohibit labelled breaks/continues through closures or async blocks, fixing an ICE. In addition, it improves the diagnostics surrounding labelled breaks/continues through closures or async blocks by informing the user if the label exists in an parent scope and telling them that won't work.

r? @petrochenkov (resolve)
cc @estebank (diagnostic changes) @tmandry (issue is from `wg-async-foundations`)
Update psm version

This new version includes a fix for building on aarch64 windows.

cc rust-lang#72881
Update cargo

## cargo
10 commits in c26576f9adddd254b3dd63aecba176434290a9f6..305eaf0dc5f5a38d6e8041319c2da95b71cf6a4a
2020-06-23 16:21:21 +0000 to 2020-06-30 14:16:08 +0000
- Update core-foundation requirement from 0.7.0 to 0.9.0 (rust-lang/cargo#8432)
- Parse `# env-dep` directives in dep-info files (rust-lang/cargo#8421)
- Move string interning to util (rust-lang/cargo#8419)
- Expose built cdylib artifacts in the Compilation structure (rust-lang/cargo#8418)
- Remove unused serde_derive dependency from the crates.io crate (rust-lang/cargo#8416)
- Remove unused remove_dir_all dependency (rust-lang/cargo#8412)
- Improve git error messages a bit (rust-lang/cargo#8409)
- Improve the description of Config.home_path (rust-lang/cargo#8408)
- Improve support for non-`master` main branches (rust-lang/cargo#8364)
- Document that OUT_DIR in JSON messages is an absolute path (rust-lang/cargo#8403)

## rls
2020-06-19 15:36:00 +0200 to 2020-06-30 23:34:52 +0200
- Update cargo (rust-lang/rls#1686)
Add option for local docker testing.

This adds the option `--dev` to `src/ci/docker/run.sh` so that it will enter an interactive environment for local testing. I have often needed this for testing things, but I always needed to edit this script. I wanted the ability to interact in the environment, run different commands, inspect errors, etc.
disable BTree min_max test in Miri for now

Until rust-lang#73915 is fixed, better skip this test in Miri so that we can test the others at least.
@Manishearth
Copy link
Member Author

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

@bors
Copy link
Contributor

bors commented Jul 2, 2020

📌 Commit e580b31 has been approved by Manishearth

@rustbot rustbot added the rollup A PR which is a rollup label Jul 2, 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 2, 2020
@Manishearth
Copy link
Member Author

This is a small rollup, but I don't expect this to pass, half the PRs in here are ones I consider very iffy. The goal is to sniff out any test failures, and let it land if there aren't, giving us a clean slate when it comes to iffy PRs.

@bors
Copy link
Contributor

bors commented Jul 2, 2020

⌛ Testing commit e580b31 with merge e5a454d6bfedeb1d81472922479d5c47ad164ee3...

@bors
Copy link
Contributor

bors commented Jul 2, 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 2, 2020
@Manishearth
Copy link
Member Author

2020-07-02T21:04:56.1997387Z �[0m�[1m�[38;5;9merror�[0m�[0m�[1m: this arithmetic operation will overflow�[0m
2020-07-02T21:04:56.1998277Z �[0m    �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/tools/cargo/src/cargo/core/compiler/fingerprint.rs:1967:21�[0m
2020-07-02T21:04:56.1998864Z �[0m     �[0m�[0m�[1m�[38;5;12m|�[0m
2020-07-02T21:04:56.2002872Z �[0m�[1m�[38;5;12m1967�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0m            assert!(val >> 32 == 0);�[0m
2020-07-02T21:04:56.2004266Z �[0m     �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                    �[0m�[0m�[1m�[38;5;9m^^^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mattempt to shift right by 32_i32 which would overflow�[0m
2020-07-02T21:04:56.2004924Z �[0m     �[0m�[0m�[1m�[38;5;12m|�[0m
2020-07-02T21:04:56.2005638Z �[0m     �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: `#[deny(arithmetic_overflow)]` on by default�[0m
2020-07-02T21:04:56.2005849Z 
2020-07-02T21:04:57.0469347Z �[0m�[1m�[38;5;9merror�[0m�[0m�[1m: aborting due to previous error�[0m

@Manishearth Manishearth closed this Jul 2, 2020
@Manishearth Manishearth mentioned this pull request Jul 2, 2020
@Manishearth Manishearth deleted the rollup-dje1lz6 branch July 18, 2020 01:14
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.

9 participants