]> git.lizzy.rs Git - rust.git/log
rust.git
4 years agoAuto merge of #1422 - RalfJung:cargo-miri-workspace, r=oli-obk
bors [Thu, 28 May 2020 13:02:41 +0000 (13:02 +0000)]
Auto merge of #1422 - RalfJung:cargo-miri-workspace, r=oli-obk

Move cargo-miri into separate package

So far, `cargo-miri` depended on the Miri library crate. That was mostly for convenience (to avoid having to deal with workspaces), but also because until recently `cargo-miri` needed access to the ["Miri default flags"](https://github.com/rust-lang/miri/blob/af044209b02f561adb3dad9f5f0deea7378f0ac0/src/lib.rs#L75). But with `MIRI_BE_RUSTC` that is no longer the case, so we can remove this fake dependency. :)

@oli-obk what do you think? Also I expect the rustc bootstrap integration will need updates, hints would be appreciated. :D

4 years agoAuto merge of #1438 - RalfJung:rustup, r=RalfJung
bors [Thu, 28 May 2020 07:19:33 +0000 (07:19 +0000)]
Auto merge of #1438 - RalfJung:rustup, r=RalfJung

rustup

Just ensuring everything still works.

4 years agorustup
Ralf Jung [Thu, 28 May 2020 07:19:01 +0000 (09:19 +0200)]
rustup

4 years agocargo-miri: allow overwriting miri command, and make that consistent with compiletest
Ralf Jung [Thu, 21 May 2020 12:24:41 +0000 (14:24 +0200)]
cargo-miri: allow overwriting miri command, and make that consistent with compiletest

4 years agono workspace as that is incompatible with the rustc submodule
Ralf Jung [Thu, 21 May 2020 12:18:18 +0000 (14:18 +0200)]
no workspace as that is incompatible with the rustc submodule

4 years agore-add some fake dependencies to avoid rebuilds
Ralf Jung [Thu, 21 May 2020 09:21:03 +0000 (11:21 +0200)]
re-add some fake dependencies to avoid rebuilds

4 years agofmt
Ralf Jung [Thu, 21 May 2020 09:32:12 +0000 (11:32 +0200)]
fmt

4 years agomake sure CI fails when we do not recognize the platform
Ralf Jung [Thu, 21 May 2020 09:30:37 +0000 (11:30 +0200)]
make sure CI fails when we do not recognize the platform

4 years agojust respect existing RUSTFLAGS instead of providing another override
Ralf Jung [Thu, 21 May 2020 09:23:04 +0000 (11:23 +0200)]
just respect existing RUSTFLAGS instead of providing another override

4 years agomake cargo-miri a separate crate in a workspace
Ralf Jung [Thu, 21 May 2020 09:00:06 +0000 (11:00 +0200)]
make cargo-miri a separate crate in a workspace

4 years agoAuto merge of #1437 - RalfJung:strip, r=RalfJung
bors [Thu, 28 May 2020 06:52:42 +0000 (06:52 +0000)]
Auto merge of #1437 - RalfJung:strip, r=RalfJung

use strip_prefix where it makes sense

4 years agouse strip_prefix where it makes sense
Ralf Jung [Thu, 28 May 2020 06:51:38 +0000 (08:51 +0200)]
use strip_prefix where it makes sense

4 years agoAuto merge of #1435 - RalfJung:stdin-read-error, r=RalfJung
bors [Mon, 25 May 2020 08:47:28 +0000 (08:47 +0000)]
Auto merge of #1435 - RalfJung:stdin-read-error, r=RalfJung

better error when using FDs 0-2 the wrong way

4 years agobetter error when reading from stdin
Ralf Jung [Mon, 25 May 2020 08:39:37 +0000 (10:39 +0200)]
better error when reading from stdin

4 years agoAuto merge of #1433 - RalfJung:condattr-setclock, r=RalfJung
bors [Mon, 25 May 2020 07:59:21 +0000 (07:59 +0000)]
Auto merge of #1433 - RalfJung:condattr-setclock, r=RalfJung

macOS does not have pthread_condattr_setclock/getclock

4 years agoadd an assertion
Ralf Jung [Mon, 25 May 2020 07:45:42 +0000 (09:45 +0200)]
add an assertion

4 years agomacos does not have pthread_condattr_setclock/getclock
Ralf Jung [Mon, 25 May 2020 07:42:08 +0000 (09:42 +0200)]
macos does not have pthread_condattr_setclock/getclock

4 years agoAuto merge of #1362 - vakaras:add-sync-primitives-cr1, r=RalfJung
bors [Mon, 25 May 2020 07:02:53 +0000 (07:02 +0000)]
Auto merge of #1362 - vakaras:add-sync-primitives-cr1, r=RalfJung

Add sync primitives

This is a follow up PR for https://github.com/rust-lang/miri/pull/1284 that adds support for the missing synchronization primitives.

Sorry for flooding with PRs, but my internship is coming to an end and I need to get things out.

Fixes https://github.com/rust-lang/miri/issues/1419

4 years agoIncrease the elapsed time window.
Vytautas Astrauskas [Mon, 25 May 2020 06:07:07 +0000 (08:07 +0200)]
Increase the elapsed time window.

4 years agoFix compilation errors after rebase.
Vytautas Astrauskas [Sun, 24 May 2020 22:28:01 +0000 (00:28 +0200)]
Fix compilation errors after rebase.

4 years agoSmall fixes.
Vytautas Astrauskas [Sun, 24 May 2020 18:29:56 +0000 (20:29 +0200)]
Small fixes.

4 years agoFix #1419.
Vytautas Astrauskas [Sun, 24 May 2020 18:20:28 +0000 (20:20 +0200)]
Fix #1419.

4 years agoSmall changes.
Vytautas Astrauskas [Tue, 19 May 2020 16:44:32 +0000 (18:44 +0200)]
Small changes.

4 years agoRewrite notify all test.
Vytautas Astrauskas [Tue, 19 May 2020 16:33:26 +0000 (18:33 +0200)]
Rewrite notify all test.

4 years agoSmall changes.
Vytautas Astrauskas [Tue, 19 May 2020 14:47:25 +0000 (16:47 +0200)]
Small changes.

4 years agoChange the scheduling to execute timeout callbacks first.
Vytautas Astrauskas [Tue, 19 May 2020 14:26:42 +0000 (16:26 +0200)]
Change the scheduling to execute timeout callbacks first.

4 years agoSmall changes.
Vytautas Astrauskas [Mon, 18 May 2020 15:18:15 +0000 (17:18 +0200)]
Small changes.

4 years agoAdd comments explaining the declare_id macro.
Vytautas Astrauskas [Mon, 18 May 2020 14:39:19 +0000 (16:39 +0200)]
Add comments explaining the declare_id macro.

4 years agoChange how the time is handled.
Vytautas Astrauskas [Mon, 18 May 2020 14:28:19 +0000 (16:28 +0200)]
Change how the time is handled.

4 years agoCleanup Condvar tests.
Vytautas Astrauskas [Thu, 30 Apr 2020 22:37:27 +0000 (15:37 -0700)]
Cleanup Condvar tests.

4 years agoAdd a timeout test for conditional variables.
Vytautas Astrauskas [Thu, 30 Apr 2020 21:59:35 +0000 (14:59 -0700)]
Add a timeout test for conditional variables.

4 years agoMove all run-pass synchronization primitive tests to sync.rs.
Vytautas Astrauskas [Thu, 30 Apr 2020 21:48:09 +0000 (14:48 -0700)]
Move all run-pass synchronization primitive tests to sync.rs.

4 years agoImprove code readability and comments.
Vytautas Astrauskas [Thu, 30 Apr 2020 21:07:07 +0000 (14:07 -0700)]
Improve code readability and comments.

4 years agoCleanup.
Vytautas Astrauskas [Thu, 30 Apr 2020 20:47:12 +0000 (13:47 -0700)]
Cleanup.

4 years agoImplement support for synchronization primitives.
Vytautas Astrauskas [Tue, 21 Apr 2020 23:38:14 +0000 (16:38 -0700)]
Implement support for synchronization primitives.

4 years agoAuto merge of #1432 - RalfJung:int-size, r=RalfJung
bors [Sun, 24 May 2020 17:21:20 +0000 (17:21 +0000)]
Auto merge of #1432 - RalfJung:int-size, r=RalfJung

use helper method to compute size of int type

4 years agouse helper method to compute size of int type
Ralf Jung [Sun, 24 May 2020 17:20:44 +0000 (19:20 +0200)]
use helper method to compute size of int type

4 years agoAuto merge of #1426 - RalfJung:no-wrapper, r=RalfJung
bors [Sun, 24 May 2020 12:48:12 +0000 (12:48 +0000)]
Auto merge of #1426 - RalfJung:no-wrapper, r=RalfJung

unset RUSTC_WRAPPER for xargo invocation

Fixes https://github.com/rust-lang/miri/issues/1421

@bjorn3 @oli-obk do you think that is a reasonable way to solve this issue?

4 years agounset RUSTC_WRAPPER for xargo invocation
Ralf Jung [Fri, 22 May 2020 08:12:32 +0000 (10:12 +0200)]
unset RUSTC_WRAPPER for xargo invocation

4 years agoAuto merge of #1431 - RalfJung:rustup, r=RalfJung
bors [Sun, 24 May 2020 12:01:05 +0000 (12:01 +0000)]
Auto merge of #1431 - RalfJung:rustup, r=RalfJung

rustup

Just making sure it all still works.

4 years agorustup
Ralf Jung [Sun, 24 May 2020 12:00:32 +0000 (14:00 +0200)]
rustup

4 years agoAuto merge of #1430 - RalfJung:unsize, r=RalfJung
bors [Sun, 24 May 2020 10:15:05 +0000 (10:15 +0000)]
Auto merge of #1430 - RalfJung:unsize, r=RalfJung

add interesting unsizing test

@bors r+

4 years agoadd interesting unsizing test
Ralf Jung [Sun, 24 May 2020 09:58:19 +0000 (11:58 +0200)]
add interesting unsizing test

4 years agoAuto merge of #1429 - RalfJung:discriminant_value, r=RalfJung
bors [Sat, 23 May 2020 14:31:37 +0000 (14:31 +0000)]
Auto merge of #1429 - RalfJung:discriminant_value, r=RalfJung

test discriminant_value intrinsic

Make sure this works for all types, not just enums/generators.

4 years agotest discriminant_value intrinsic
Ralf Jung [Sat, 23 May 2020 14:30:50 +0000 (16:30 +0200)]
test discriminant_value intrinsic

4 years agoAuto merge of #1374 - divergentdave:InvalidUndefBytes, r=RalfJung
bors [Fri, 22 May 2020 15:07:39 +0000 (15:07 +0000)]
Auto merge of #1374 - divergentdave:InvalidUndefBytes, r=RalfJung

InvalidUndefBytes: Update to match rustc changes

This is a companion PR for rust-lang/rust#71610. This won't build yet, but we may need these changes in a future rustup.

4 years agorustup
Ralf Jung [Fri, 22 May 2020 15:03:37 +0000 (17:03 +0200)]
rustup

4 years agoUpdate to match rustc changes
David Cook [Thu, 14 May 2020 13:03:49 +0000 (08:03 -0500)]
Update to match rustc changes

4 years agoAuto merge of #1428 - RalfJung:shim-arg-size-verify, r=RalfJung
bors [Fri, 22 May 2020 11:20:04 +0000 (11:20 +0000)]
Auto merge of #1428 - RalfJung:shim-arg-size-verify, r=RalfJung

verify the size of all shim arguments

4 years agoverify the size of all shim arguments
Ralf Jung [Fri, 22 May 2020 09:56:18 +0000 (11:56 +0200)]
verify the size of all shim arguments

4 years agoAuto merge of #1427 - RalfJung:rustup, r=RalfJung
bors [Fri, 22 May 2020 08:30:35 +0000 (08:30 +0000)]
Auto merge of #1427 - RalfJung:rustup, r=RalfJung

rustup, and now we also need to install llvm-tools

Fixes fallout from https://github.com/rust-lang/rust/pull/72000

4 years agorustup, and now we also need to install llvm-tools
Ralf Jung [Fri, 22 May 2020 08:29:47 +0000 (10:29 +0200)]
rustup, and now we also need to install llvm-tools

4 years agoAuto merge of #1425 - RalfJung:rustup, r=RalfJung
bors [Fri, 22 May 2020 07:01:21 +0000 (07:01 +0000)]
Auto merge of #1425 - RalfJung:rustup, r=RalfJung

rustup

Make sure that https://github.com/rust-lang/rust/pull/72425 helped

4 years agorustup
Ralf Jung [Fri, 22 May 2020 07:00:32 +0000 (09:00 +0200)]
rustup

4 years agoAuto merge of #1424 - RalfJung:dlsym, r=RalfJung
bors [Thu, 21 May 2020 21:25:46 +0000 (21:25 +0000)]
Auto merge of #1424 - RalfJung:dlsym, r=RalfJung

prepare Dlsym system for dynamic symbols on Windows

This makes progress towards https://github.com/rust-lang/miri/issues/1059.

4 years agoalso pretend GetSystemTimePreciseAsFileTime does not exist
Ralf Jung [Thu, 21 May 2020 21:24:37 +0000 (23:24 +0200)]
also pretend GetSystemTimePreciseAsFileTime does not exist

4 years agoGetProcAddress: basic validation for hModule argument
Ralf Jung [Thu, 21 May 2020 21:06:31 +0000 (23:06 +0200)]
GetProcAddress: basic validation for hModule argument

4 years agodisentangle macos and linux dlsyms
Ralf Jung [Thu, 21 May 2020 21:00:59 +0000 (23:00 +0200)]
disentangle macos and linux dlsyms

4 years agoprepare Dlsym system for dynamic symbols on Windows
Ralf Jung [Thu, 21 May 2020 20:38:06 +0000 (22:38 +0200)]
prepare Dlsym system for dynamic symbols on Windows

4 years agoAuto merge of #1423 - RalfJung:rustup, r=RalfJung
bors [Thu, 21 May 2020 14:34:05 +0000 (14:34 +0000)]
Auto merge of #1423 - RalfJung:rustup, r=RalfJung

rustup

No changes needed -- but the next bump is blocked on https://github.com/rust-lang/rust/pull/72425.

4 years agorustup
Ralf Jung [Thu, 21 May 2020 13:43:26 +0000 (15:43 +0200)]
rustup

4 years agoAuto merge of #1420 - RalfJung:rustup, r=RalfJung
bors [Tue, 19 May 2020 22:02:05 +0000 (22:02 +0000)]
Auto merge of #1420 - RalfJung:rustup, r=RalfJung

rustup

adjust test for changed allocation strategy

4 years agoadjust for changed allocation strategy
Ralf Jung [Tue, 19 May 2020 22:00:35 +0000 (00:00 +0200)]
adjust for changed allocation strategy

4 years agoAuto merge of #1417 - RalfJung:libstd-rebuilds, r=RalfJung
bors [Sun, 17 May 2020 09:32:47 +0000 (09:32 +0000)]
Auto merge of #1417 - RalfJung:libstd-rebuilds, r=RalfJung

fix libstd rebuilds due to RUSTFLAGS changes

Until recently we were always overwriting `RUSTFLAGS`, but we stopped doing that when moving to `MIRI_BE_RUSTC`. That introduced the regression in https://github.com/rust-lang/miri/issues/1410. This fixes it.

Fixes https://github.com/rust-lang/miri/issues/1410

4 years agofix libstd rebuilds due to RUSTFLAGS changes
Ralf Jung [Sun, 17 May 2020 09:20:05 +0000 (11:20 +0200)]
fix libstd rebuilds due to RUSTFLAGS changes

4 years agoAuto merge of #1415 - RalfJung:test-suite-filter, r=RalfJung
bors [Sun, 17 May 2020 08:13:13 +0000 (08:13 +0000)]
Auto merge of #1415 - RalfJung:test-suite-filter, r=RalfJung

add test suite filter example to README and 'cargo miri --help'

Fixes https://github.com/rust-lang/miri/issues/1414

4 years agoadd test suite filter example to README and 'cargo miri --help'
Ralf Jung [Sun, 17 May 2020 08:08:45 +0000 (10:08 +0200)]
add test suite filter example to README and 'cargo miri --help'

4 years agoAuto merge of #1413 - RalfJung:catch_with_exit_code, r=RalfJung
bors [Sat, 16 May 2020 09:30:49 +0000 (09:30 +0000)]
Auto merge of #1413 - RalfJung:catch_with_exit_code, r=RalfJung

use new rustc_driver::catch_with_exit_code

4 years agouse new rustc_driver::catch_with_exit_code
Ralf Jung [Sat, 16 May 2020 09:30:11 +0000 (11:30 +0200)]
use new rustc_driver::catch_with_exit_code

4 years agoAuto merge of #1411 - RalfJung:ci, r=RalfJung
bors [Thu, 14 May 2020 17:22:04 +0000 (17:22 +0000)]
Auto merge of #1411 - RalfJung:ci, r=RalfJung

test Linux on macOS host

This accidentally got lost in https://github.com/rust-lang/miri/pull/1407

4 years agotest Linux on macOS host
Ralf Jung [Thu, 14 May 2020 17:21:04 +0000 (19:21 +0200)]
test Linux on macOS host

4 years agoAuto merge of #1407 - RalfJung:appveyor, r=RalfJung
bors [Mon, 11 May 2020 10:10:29 +0000 (10:10 +0000)]
Auto merge of #1407 - RalfJung:appveyor, r=RalfJung

Share CI code between Travis and AppVeyor

4 years agoalways lock on CI
Ralf Jung [Mon, 11 May 2020 09:19:26 +0000 (11:19 +0200)]
always lock on CI

4 years agoWindows CI: rely on stable cargo
Ralf Jung [Mon, 11 May 2020 08:59:01 +0000 (10:59 +0200)]
Windows CI: rely on stable cargo

4 years agofix python interpreter on Windows
Ralf Jung [Mon, 11 May 2020 08:40:25 +0000 (10:40 +0200)]
fix python interpreter on Windows

4 years agofix warnings for non-Unix builds
Ralf Jung [Mon, 11 May 2020 08:13:17 +0000 (10:13 +0200)]
fix warnings for non-Unix builds

4 years agoplay with bash on AppVeyor
Ralf Jung [Sun, 10 May 2020 21:49:10 +0000 (23:49 +0200)]
play with bash on AppVeyor

Also consistently order and format our two CI files

4 years agoAuto merge of #1409 - RalfJung:compiletest-no-rustc, r=RalfJung
bors [Mon, 11 May 2020 08:56:53 +0000 (08:56 +0000)]
Auto merge of #1409 - RalfJung:compiletest-no-rustc, r=RalfJung

compiletest: no need to call rustc here

This also means we do not need the `RUSTC_TEST_SUITE` env var any more.

4 years agofmt
Ralf Jung [Mon, 11 May 2020 08:54:21 +0000 (10:54 +0200)]
fmt

4 years agocompiletest: no need to call rustc here
Ralf Jung [Mon, 11 May 2020 08:37:35 +0000 (10:37 +0200)]
compiletest: no need to call rustc here

4 years agoAuto merge of #1408 - RalfJung:comments, r=RalfJung
bors [Sun, 10 May 2020 22:12:00 +0000 (22:12 +0000)]
Auto merge of #1408 - RalfJung:comments, r=RalfJung

fix some comments, and run_compiler return type

4 years agofix some comments, and run_compiler return type
Ralf Jung [Sun, 10 May 2020 22:07:59 +0000 (00:07 +0200)]
fix some comments, and run_compiler return type

4 years agoAuto merge of #1406 - RalfJung:miri-as-rustc, r=RalfJung
bors [Sun, 10 May 2020 17:00:14 +0000 (17:00 +0000)]
Auto merge of #1406 - RalfJung:miri-as-rustc, r=RalfJung

cargo-miri: never invoke rustc

Always go through 'MIRI_BE_RUSTC=1 miri' instead. This is based on @oli-obk's great idea to add a way to make Miri behave like rustc, which already helped us in https://github.com/rust-lang/miri/pull/1405. Now it means in `cargo-miri` we run *all* crates through the same binary, and use the env var to determine if we compile or interpret them. This makes sure the compiler is consistent.

The `rustc` binary of the current toolchain is now not used at all, only the `miri` binary is. In particular this means we can kill the sysroot consistency check. :)

4 years agowe do not need to set RUSTFLAGS for xargo any more as miri-as-rustc already uses...
Ralf Jung [Sun, 10 May 2020 16:56:38 +0000 (18:56 +0200)]
we do not need to set RUSTFLAGS for xargo any more as miri-as-rustc already uses these flags

4 years agofix dead link in README
Ralf Jung [Sun, 10 May 2020 16:52:21 +0000 (18:52 +0200)]
fix dead link in README

4 years agocargo-miri: never invoke rustc, always go through 'MIRI_BE_RUSTC=1 miri' instead
Ralf Jung [Sun, 10 May 2020 16:41:03 +0000 (18:41 +0200)]
cargo-miri: never invoke rustc, always go through 'MIRI_BE_RUSTC=1 miri' instead

4 years agoAuto merge of #1402 - rust-lang:alloc_map_unlock, r=RalfJung
bors [Sun, 10 May 2020 08:32:58 +0000 (08:32 +0000)]
Auto merge of #1402 - rust-lang:alloc_map_unlock, r=RalfJung

Update to rustc changes

changes needed once https://github.com/rust-lang/rust/pull/71508 gets merged

4 years agorustup
Ralf Jung [Sun, 10 May 2020 08:32:29 +0000 (10:32 +0200)]
rustup

4 years agoUpdate to rustc changes
Oliver Scherer [Fri, 8 May 2020 11:56:10 +0000 (13:56 +0200)]
Update to rustc changes

4 years agoAuto merge of #1405 - RalfJung:stage-0, r=RalfJung
bors [Sat, 9 May 2020 12:09:15 +0000 (12:09 +0000)]
Auto merge of #1405 - RalfJung:stage-0, r=RalfJung

make Miri work in rustc bootstrap stage 0

Fixes https://github.com/rust-lang/rust/issues/52856

4 years agoTypo
Ralf Jung [Sat, 9 May 2020 12:08:58 +0000 (14:08 +0200)]
Typo

4 years agoadjust default sysroot when being rustc
Ralf Jung [Sat, 9 May 2020 11:20:34 +0000 (13:20 +0200)]
adjust default sysroot when being rustc

Also while at it, refactor how we pass the default Miri flags

4 years agomake Miri work in rustc bootstrap stage 0
Ralf Jung [Sat, 9 May 2020 10:24:30 +0000 (12:24 +0200)]
make Miri work in rustc bootstrap stage 0

4 years agoAuto merge of #1404 - RalfJung:cargo-miri-host-detect, r=RalfJung
bors [Sat, 9 May 2020 10:06:04 +0000 (10:06 +0000)]
Auto merge of #1404 - RalfJung:cargo-miri-host-detect, r=RalfJung

re-do cargo-miri host/target detection logic to match rustbuild

@oli-obk I think that's better than looking at `--emit` like we did before... what do you think?

4 years agoavoid env::var which requires valid UTF-8
Ralf Jung [Sat, 9 May 2020 09:58:18 +0000 (11:58 +0200)]
avoid env::var which requires valid UTF-8

4 years agomore comment
Ralf Jung [Sat, 9 May 2020 09:54:35 +0000 (11:54 +0200)]
more comment

4 years agoWording
Ralf Jung [Sat, 9 May 2020 09:53:24 +0000 (11:53 +0200)]
Wording

Co-authored-by: Oliver Scherer <github35764891676564198441@oli-obk.de>
4 years agocargo-miri: honor RUSTC env var
Ralf Jung [Sat, 9 May 2020 09:52:26 +0000 (11:52 +0200)]
cargo-miri: honor RUSTC env var

4 years agore-do cargo-miri host/target detection logic to match rustbuild
Ralf Jung [Sat, 9 May 2020 09:45:43 +0000 (11:45 +0200)]
re-do cargo-miri host/target detection logic to match rustbuild

4 years agoAuto merge of #1403 - RalfJung:rustup, r=RalfJung
bors [Sat, 9 May 2020 08:15:45 +0000 (08:15 +0000)]
Auto merge of #1403 - RalfJung:rustup, r=RalfJung

bump Rust, fix for renames