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 16 pull requests #40415

Closed
wants to merge 35 commits into from
Closed

Rollup of 16 pull requests #40415

wants to merge 35 commits into from

Conversation

sinkuu and others added 20 commits February 25, 2017 22:11
This causes problems when first cloning and bootstrapping the repository
unfortunately, so let's ensure that Cargo sticks around in its own workspace.
Because Cargo is a submodule it's not available by default on the inital clone
of the rust-lang/rust repository. Normally it's the responsibility of the
rustbuild to take care of this, but unfortunately to build rustbuild itself we
need to resolve the workspace conflicts.

To deal with this we'll just have to ensure that all submodules are in their own
workspace, which sort of makes sense anyway as updates to dependencies as
bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any
case this commit removes Cargo from the global workspace which should resolve
the issues that we've been seeing.

To actually perform this the `cargo` submodule has been moved to the top
directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace.
This commit alters the compiler to exit quickly if the only output being emitted
is `dep-info`, which doesn't need a lot of other information to generate.

Closes rust-lang#40328
Keeps MIR cleaner, `StorageLive(_: !)` makes no sense anyway.
@arielb1
Copy link
Contributor Author

arielb1 commented Mar 10, 2017

@bors r+ p=1000

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit 349258e has been approved by arielb1

@bors
Copy link
Contributor

bors commented Mar 10, 2017

🔒 Merge conflict

@arielb1
Copy link
Contributor Author

arielb1 commented Mar 10, 2017

@bors retry force

@arielb1
Copy link
Contributor Author

arielb1 commented Mar 10, 2017

@bors retry

@arielb1
Copy link
Contributor Author

arielb1 commented Mar 10, 2017

@bors r+ p=1000 retry force

@arielb1
Copy link
Contributor Author

arielb1 commented Mar 10, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit bead894 has been approved by arielb1

@alexcrichton
Copy link
Member

I'm going to in parallel try to create a different rollup, but let's still try to land this one first.

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Mar 10, 2017

🔒 Merge conflict

Ariel Ben-Yehuda added 15 commits March 10, 2017 07:47
…elix

Fix suggestion span error with a line containing multibyte characters

This PR fixes broken suggestions caused by multibyte characters.

e.g. for this code, rustc provides a broken suggestion ([playground](https://is.gd/DWGLu7)):

```rust
fn main() {
    let tup = (1,);
    println!("☃{}", tup[0]);
}
```

```
error: cannot index a value of type `({integer},)`
 --> <anon>:3:21
  |
3 |     println!("☃{}", tup[0]);
  |                     ^^^^^^
  |
help: to access tuple elements, use tuple indexing syntax as shown
  |     println!("☃{}"tup.00]);

error: aborting due to previous error
```

`CodeSuggestion::splice_lines` is misusing `Loc.col` (`CharPos`) as a byte offset when slicing source.
Don't put Cargo into the rustc workspace

This causes problems when first cloning and bootstrapping the repository
unfortunately, so let's ensure that Cargo sticks around in its own workspace.
Because Cargo is a submodule it's not available by default on the inital clone
of the rust-lang/rust repository. Normally it's the responsibility of the
rustbuild to take care of this, but unfortunately to build rustbuild itself we
need to resolve the workspace conflicts.

To deal with this we'll just have to ensure that all submodules are in their own
workspace, which sort of makes sense anyway as updates to dependencies as
bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any
case this commit removes Cargo from the global workspace which should resolve
the issues that we've been seeing.

To actually perform this the `cargo` submodule has been moved to a new `vendor`
directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace.

Closes rust-lang#40284
Allow lints to check Bodys directly

r? @eddyb

babysteps towards fixing https://github.com/Manishearth/rust-clippy/issues/1580 (disable certain lints in const environments, since they make no sense there (yet))
rustc: Exit quickly on only `--emit dep-info`

This commit alters the compiler to exit quickly if the only output being emitted
is `dep-info`, which doesn't need a lot of other information to generate.

Closes rust-lang#40328
…akis

Update syntax for `pub(restricted)`

Update the syntax before stabilization.

cc rust-lang#32409
r? @nikomatsakis
save-analysis: cope with lack of method data after a type error

Fixes rust-lang#39957

r? @eddyb
Give spans to individual path segments in AST

And use these spans in path resolution diagnostics.

The spans are spans of identifiers in segments, not whole segments. I'm not sure what spans are more useful in general, but identifier spans are a better fit for resolve errors.

HIR still doesn't have spans.

Fixes rust-lang#38927 (comment) rust-lang#38890 (comment)

r? @nrc @eddyb
Do not bother creating StorageLive for TyNever

Keeps MIR cleaner, `StorageLive(_: !)` makes no sense anyway.

r? @eddyb
Box docs: no allocation is done for ZSTs.

Updated to add a small bit saying that ZSTs don't actually allocate on `Box::new`.
emit !align attributes on stores of operand pairs

This avoids another case of missing-align UB. cc rust-lang#40373

r? @eddyb
…or, r=alexcrichton

Distinguish the ways `CStr::from_bytes_with_nul` can fail
Implement placement-in protocol for `VecDeque`

CC rust-lang#30172

r? @nagisa
@alexcrichton
Copy link
Member

@arielb1 I force pushed your branch with a rebase from master

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit b6c0676 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 10, 2017

⌛ Testing commit b6c0676 with merge eb802bb...

@bors
Copy link
Contributor

bors commented Mar 10, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Mar 10, 2017

⌛ Testing commit b6c0676 with merge 6b39f97...

@bors
Copy link
Contributor

bors commented Mar 10, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

Ok that failed due to #40385. I'm going to close this now in favor of #40420 but @arielb1 please feel free to push/modify commits on that PR as well!

@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
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.