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 5 pull requests #70403

Closed
wants to merge 31 commits into from

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

lcnr and others added 30 commits March 23, 2020 18:39
The former `done` flag was roughly similar to an `Option` tag, but left
the possibity of misuse. By using a real `Option`, we can set `None`
when the iterator is exhausted, removing any way to call it again. We
also allow niche layout this way, so the `Fuse` may be smaller.

The `FusedIterator` specialization does want to ignore the possibility
of exhaustion though, so it uses `unsafe { intrinsics::unreachable() }`
to optimize that branch away. The entire `Fuse` implementation is now
isolated in its own module to contain that unsafety.
use checked casts and arithmetic in Miri engine

This is unfortunately pretty annoying because we have to cast back and forth between `u64` and `usize` more often that should be necessary, and that cast is considered fallible.

For example, should [this](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/mir/interpret/value/enum.ConstValue.html) really be `usize`?

Also, `LayoutDetails` uses `usize` for field indices, but in Miri we use `u64` to be able to also handle array indexing. Maybe methods like `mplace_field` should be suitably generalized to accept both `u64` and `usize`?

r? @oli-obk Cc @eddyb
…-code-e0710, r=Dylan-DPC

Add long error explanation for E0710

Add long explanation for the E0710 error code
Part of rust-lang#61137

r? @GuillaumeGomez
Implement Fuse with Option

The former `done` flag was roughly similar to an `Option` tag, but left
the possibity of misuse. By using a real `Option`, we can set `None`
when the iterator is exhausted, removing any way to call it again. We
also allow niche layout this way, so the `Fuse` may be smaller.

The `FusedIterator` specialization does want to ignore the possibility
of exhaustion though, so it uses `unsafe { intrinsics::unreachable() }`
to optimize that branch away. The entire `Fuse` implementation is now
isolated in its own module to contain that unsafety.

r? @scottmcm
Update cargo.

8 commits in 7019b3ed3d539db7429d10a343b69be8c426b576..8a0d4d9c9abc74fd670353094387d62028b40ae9
2020-03-17 21:02:00 +0000 to 2020-03-24 17:57:04 +0000
- Re-implement proc-macro feature decoupling. (rust-lang/cargo#8028)
- Remove unused transitive dependencies: miniz_oxide, adler32 (rust-lang/cargo#8023)
- Fix bug with -Zfeatures=dev_dep and `check --profile=test`. (rust-lang/cargo#8027)
- Remove Config from CompileOptions. (rust-lang/cargo#8021)
- Add `rustless.org` to documented blocklist. (rust-lang/cargo#7922)
- Print colored warnings when build script panics (rust-lang/cargo#8017)
- Do not supply --crate-version flag to rustdoc if present in RUSTDOCFLAGS (rust-lang/cargo#8014)
- Add proc-macro to index, and new feature resolver. (rust-lang/cargo#8003)
@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2020-03-25T18:30:25.7227630Z ========================== Starting Command Output ===========================
2020-03-25T18:30:25.7230119Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/cd5ac80b-021c-4d8a-9f55-6bf0702b975b.sh
2020-03-25T18:30:25.7230399Z 
2020-03-25T18:30:25.7234790Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-25T18:30:25.7254209Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70403/merge to s
2020-03-25T18:30:25.7257396Z Task         : Get sources
2020-03-25T18:30:25.7257704Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-25T18:30:25.7258006Z Version      : 1.0.0
2020-03-25T18:30:25.7258205Z Author       : Microsoft
---
2020-03-25T18:30:26.7167435Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-25T18:30:26.7175321Z ##[command]git config gc.auto 0
2020-03-25T18:30:26.7181304Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-25T18:30:26.7186523Z ##[command]git config --get-all http.proxy
2020-03-25T18:30:26.7196760Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70403/merge:refs/remotes/pull/70403/merge
2020-03-25T18:30:27.0828151Z fatal: couldn't find remote ref refs/pull/70403/merge
2020-03-25T18:30:27.1610324Z ##[warning]Git fetch failed with exit code 128, back off 4.954 seconds before retry.
2020-03-25T18:30:32.0540650Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70403/merge:refs/remotes/pull/70403/merge
2020-03-25T18:30:32.7719402Z fatal: couldn't find remote ref refs/pull/70403/merge
2020-03-25T18:30:32.8341364Z ##[warning]Git fetch failed with exit code 128, back off 1.164 seconds before retry.
2020-03-25T18:30:33.9469831Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70403/merge:refs/remotes/pull/70403/merge
2020-03-25T18:30:34.5532509Z fatal: couldn't find remote ref refs/pull/70403/merge
2020-03-25T18:30:34.6097167Z ##[error]Git fetch failed with exit code: 128
2020-03-25T18:30:34.6109921Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70403/merge to s
2020-03-25T18:30:34.6527756Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70403/merge to s
2020-03-25T18:30:34.6533666Z Task         : Get sources
2020-03-25T18:30:34.6534029Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-25T18:30:34.6534378Z Version      : 1.0.0
2020-03-25T18:30:34.6534606Z Author       : Microsoft
2020-03-25T18:30:34.6534606Z Author       : Microsoft
2020-03-25T18:30:34.6534955Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-25T18:30:34.6535365Z ==============================================================================
2020-03-25T18:30:34.9569569Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70403/merge to s
2020-03-25T18:30:34.9656895Z Cleaning up task key
2020-03-25T18:30:34.9658229Z Start cleaning up orphan processes.
2020-03-25T18:30:34.9794518Z ##[section]Finishing: Finalize Job
2020-03-25T18:30:34.9834825Z ##[section]Finishing: Linux x86_64-gnu-tools

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 @rust-lang/infra. (Feature Requests)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants