Skip to content

Rollup of 5 pull requests#64182

Closed
Centril wants to merge 58 commits intorust-lang:masterfrom
Centril:rollup-fmohja1
Closed

Rollup of 5 pull requests#64182
Centril wants to merge 58 commits intorust-lang:masterfrom
Centril:rollup-fmohja1

Conversation

@Centril
Copy link
Contributor

@Centril Centril commented Sep 5, 2019

Successful merges:

Failed merges:

r? @ghost

newpavlov and others added 30 commits August 19, 2019 09:47
@newpavlov
use wasi crate
6896ed3
@newpavlov
return 0 from errno function
23cc850
@newpavlov
replace libc::nanosleep with wasi::poll_oneoff
cb52065
@newpavlov
remove to_string
75a553f
@newpavlov
use wasi::get_args
7a4f0ae
@newpavlov
use wasi::get_environ
52d2871
@newpavlov
remove libc import
8394dbb
@newpavlov
use non-zero clock id
338fc7d
@newpavlov
typo fix
7658a13
@newpavlov
use const
e5ba80a
@newpavlov
fix
c052376
@newpavlov
fix C incompatibilities
744442d
@newpavlov
Merge branch 'master' into wasi
7daf890
@newpavlov
use new get_args
4dee102
@newpavlov
update args
88fd945
@newpavlov
fixes
a47e3c0
@newpavlov
move cvt
926f364
@newpavlov
Merge branch 'master' into wasi
3772146
@newpavlov
update to wasi v0.7
6374b84
@newpavlov
add wasi license to the licenses whitelist
06acfb2
@newpavlov
whitelist wasi crate
127311b
@newpavlov
simplify code
9fd203a
@newpavlov
make wasi a target-specific dependency
0662fcf
@ayuusweetfish
Improve searching in rustdoc and add tests
cb84aa4
@cuviper
Assume non-git LLVM is fresh if the stamp file exists
53fe764 
Rustbuild usually writes the LLVM submodule commit in a stamp file, so
we can avoid rebuilding it unnecessarily. However, for builds from a
source tarball (non-git), we were assuming a rebuild is always needed.
This can cause a lot of extra work if any environment like `CFLAGS`
changed between steps like build and install, which are often separate
in distro builds.

Now we also write an empty stamp file if the git commit is unknown, and
its presence is trusted to indicate that no rebuild is needed. An info
message reports that this is happening, along with the stamp file path
that can be deleted to force a rebuild anyway.
@Centril
resolve: extract resolve_params.
af06bfb
@Centril
resolve: cleanup using with_rib, etc.
f8835ee
@Centril
resolve: simplify resolve_arm.
6d537d4
@Centril
resolve: extract try_resolve_as_non_binding.
219ddde
@Centril
resolve: add type IdentMap<T> alias.
f343e84
@Centril
Rollup merge of rust-lang#64175 - GuillaumeGomez:replace-span-when-it…
e13ea1e 
…-should-be-div, r=Mark-Simulacrum

Fix invalid span generation when it should be div

Fixes rust-lang#64146.

It changes basically nothing in the display... Can be checked with:

```rust
pub enum X {
    /// Some doc?
    ///
    /// with lines!
    Foo {
        /// a
        ///
        /// b
        x: u32,
        /// Doc!
        ///
        /// ```
        /// yolo
        /// ```
        y: String,
    },
    /// Doc!
    ///
    /// ```
    /// yolo
    /// ```
    Bar(String),
}
```

r? @Mark-Simulacrum
@Centril
Copy link
Contributor Author

Centril commented Sep 5, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Sep 5, 2019

📌 Commit e13ea1e has been approved by Centril

@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 Sep 5, 2019
@bors
Copy link
Collaborator

bors commented Sep 5, 2019

⌛ Testing commit e13ea1e with merge f103cf5...

bors added a commit that referenced this pull request Sep 5, 2019
@bors
Auto merge of #64182 - Centril:rollup-fmohja1, r=Centril
f103cf5 
Rollup of 5 pull requests

Successful merges:

 - #63676 (Use wasi crate for Core API)
 - #64094 (Improve searching in rustdoc and add tests)
 - #64111 (or-patterns: Uniformly use `PatKind::Or` in AST & Fix/Cleanup resolve)
 - #64156 (Assume non-git LLVM is fresh if the stamp file exists)
 - #64175 (Fix invalid span generation when it should be div)

Failed merges:

 - #63806 (Upgrade rand to 0.7)

r? @ghost
@bors
Copy link
Collaborator

bors commented Sep 5, 2019

💥 Test timed out

@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 Sep 5, 2019
@Centril
Copy link
Contributor Author

Centril commented Sep 5, 2019

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 5, 2019
@bors
Copy link
Collaborator

bors commented Sep 5, 2019

⌛ Testing commit e13ea1e with merge eccdf3cb1581d84340a9968069edfced5c2984c1...

@Centril Centril mentioned this pull request Sep 5, 2019
Merged
@bors
Copy link
Collaborator

bors commented Sep 6, 2019

💥 Test timed out

@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 Sep 6, 2019
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Sep 6, 2019

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 6, 2019
@bors
Copy link
Collaborator

bors commented Sep 6, 2019

⌛ Testing commit e13ea1e with merge 6d00e4d4c93ea720d9f0879986b3f1c93eb58cbd...

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Sep 6, 2019

@bors retry r-

Creating a larger rollup which'll subsume this one

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 6, 2019
@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 6, 2019

Your PR failed (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.

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 @TimNN. (Feature Requests)

@Centril Centril deleted the rollup-fmohja1 branch September 6, 2019 07:35
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@Centril @bors @Mark-Simulacrum @rust-highfive @newpavlov @ayuusweetfish @cuviper @GuillaumeGomez