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 #74412

Closed
wants to merge 59 commits into from

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

mzohreva and others added 30 commits June 12, 2020 11:26
When ran on Windows `cp` will follow symlink: `checkout/build/<target>/<stage>/lib/rustlib/src/rust`.
It points to `checkout` which means the test will get stuck in copying loop until there is no space left.
As rustc is permanently unstable. So marking every items
with unstable is essential useless.
This simplifies the definition for ARCH.

Note that this changes asmjs-unknown-emscripten ARCH to `wasm32`,
which reflects the actual target arch.
Simplifies some of the expressions, and provides a default.
This allows setting a default abort using the core intrinsic.
Use a fall-through for no_std targets.
The `lifetimes` field is always empty. This commit removes it, and
renames the type as `Bounds`.
…t scope

- Accept DefId in resolve_str_path_error

This will probably break lots of internal invariants.
jyn514 and others added 15 commits July 16, 2020 18:26
intra_doc_resolution_failure is not a lint.
It's equivalent to `Ident::from_str_and_span`. The commit also
introduces some more static symbols so that `Ident::new` can be used in
various places instead of `Ident::from_str_and_span`.

The commit also changes `Path::path` from a `&str` to a `Symbol`, which
then allows the lifetime annotation to be removed from `Ty`. Also, the
use of `Symbol` in `Bounds` removes the need for its lifetime
annotation.
It's intended only for very temporary use.
This replaces the need for the `description` and `details` symbols in
`UnsafetyViolation`, which are static. As a result some
`Symbol::as_str()` calls are no longer necessary, which is nice.
…anishearth

Resolve items for cross-crate imports relative to the original module

~~Blocked on rust-lang#73103 and rust-lang#73566

Closes rust-lang#65983.

I tested on the following code (as mentioned in rust-lang#65983 (comment)):

```
pub use rand::Rng;
```
and rustdoc generated the following link: https://rust-random.github.io/rand/rand_core/trait.RngCore.html
…hrogb

Enable some timeouts in SGX platform

This would partially resolve fortanix/rust-sgx#31

cc @jethrogb and @Goirad
…atsakis

Fix MinGW `run-make-fulldeps` tests

`compiler-rt-works-on-mingw` and `libs-search-path` were not ran because `only-mingw` doesn't match any target.
Enabled and verified few ignored tests with `windows-gnu` toolchain. They are still ignored on MSVC since I'm not experienced with this target.
…Mark-Simulacrum

Add build support for Cargo's build-std feature.

This makes some changes to the standard library to make it easier to use with Cargo's build-std feature. The primary goal is to make it so that Cargo and its users do not need to know which crates to build and which features to use for every platform.

Conditional cfgs are adjusted so that there is usually a fall-through for unsupported platforms. Additionally, there is a "restricted-std" feature to mark `std` as unstable when used with build-std on no_std platforms. There is no intent to stabilize this feature for the foreseeable future.

This borrows some of the implementation for wasm which already does what this needs. More code sharing can be done with some other platforms (there is a lot of duplication with cloudabi, hermit, and sgx), but I figure that can be done in a future PR.

There are some small changes to stable behavior in this PR:
- `std::env::consts::ARCH` on asmjs now reports "wasm32", to match its actual architecture.
- Some of the wasm error messages for unsupported features report a slightly different error message so that the code can be reused.

There should otherwise not be any changes to how std is built for distribution via bootstrap.

This does not yet support all platforms when used with build-std.

- It doesn't work with 16-bit targets (hashbrown does not support that).
- It does not work with JSON spec targets.
    - In particular, all target triple snooping will need to be replaced with appropriate target option checking.
- Switching to gimli (rust-lang#73441) will make cross-building *much* easier.
- There are still a ton of issues on the Cargo side to resolve. A big one is panic strategy support.

Future PRs are intended to address some of these issues.
…ents, r=oli-obk

Some `Symbol` related improvements

These commits make things nicer and avoid some `Symbol::as_str()` calls.

r? @oli-obk
… r=pietroalbini

Add RISC-V GNU/Linux to src/tools/build-manifest as a host platform

Missed during rust-lang#72973
@Manishearth
Copy link
Member Author

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

@rustbot rustbot added the rollup A PR which is a rollup label Jul 16, 2020
@bors
Copy link
Contributor

bors commented Jul 16, 2020

📌 Commit 3c8adc6 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jul 16, 2020

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

@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 16, 2020
@bors
Copy link
Contributor

bors commented Jul 16, 2020

⌛ Testing commit 3c8adc6 with merge ff0e3576fbf2e1b4177e45a1f9467e4c64c763be...

@bors
Copy link
Contributor

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

2020-07-16T22:46:45.0248894Z �[0m�[0m�[1m�[32m    Finished�[0m release [optimized] target(s) in 25.05s
2020-07-16T22:46:45.0355607Z [TIMING] ToolBuild { compiler: Compiler { stage: 0, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", tool: "tidy", path: "src/tools/tidy", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 25.065
2020-07-16T22:46:45.0357013Z tidy check
2020-07-16T22:46:45.1959111Z tidy error: /checkout/src/librustdoc/html/static/rustdoc.css:1128: CSS files use tabs for indent
2020-07-16T22:46:45.1959986Z tidy error: /checkout/src/librustdoc/html/static/rustdoc.css:1136: CSS files use tabs for indent
2020-07-16T22:46:45.1960232Z tidy error: /checkout/src/librustdoc/html/static/rustdoc.css:1137: CSS files use tabs for indent
2020-07-16T22:46:45.1960769Z tidy error: /checkout/src/librustdoc/html/static/rustdoc.css:1138: CSS files use tabs for indent
2020-07-16T22:46:45.1961134Z tidy error: /checkout/src/librustdoc/html/static/rustdoc.css:1142: CSS files use tabs for indent
2020-07-16T22:46:45.1973850Z tidy error: /checkout/src/librustdoc/html/static/themes/ayu.css:394: CSS files use tabs for indent
2020-07-16T22:46:45.1975089Z tidy error: /checkout/src/librustdoc/html/static/themes/ayu.css:395: CSS files use tabs for indent
2020-07-16T22:46:49.3754271Z Checking which error codes lack tests...
2020-07-16T22:46:49.5504782Z some tidy checks failed

@Manishearth Manishearth mentioned this pull request Jul 16, 2020
@bors
Copy link
Contributor

bors commented Jul 17, 2020

☔ The latest upstream changes (presumably #74422) made this pull request unmergeable. Please resolve the merge conflicts.

@Manishearth Manishearth deleted the rollup-o405rk0 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.