Skip to content

Rollup of 14 pull requests - #45674

Merged
bors merged 33 commits into
rust-lang:masterfrom
kennytm:rollup
Nov 1, 2017
Merged

Rollup of 14 pull requests#45674
bors merged 33 commits into
rust-lang:masterfrom
kennytm:rollup

Conversation

GuillaumeGomezand others added 30 commits October 22, 2017 16:08
This is a rather obscure part of the language.
Decode span data only once
This multiline string literal was missing a backslash, leaving an awkward
newline and 35 spaces in the middle of the message.
But while we're here, the existing message seems kind of long in comparison to
similar notes: to cut it down, we excise the mentions of doc comments, which
seems sensible because we know that this erroneous attribute is not a doc
comment (notice the `is_sugared_doc: false` at the end of the function; if it
had been a doc comment, that error would get set in the `token::DocComment`
match branch of `parse_outer_attributes`).
It was a bit outdated, claimed to be able to do less than it actually
could.
This is important for the unstable book stub generation.
This is kind of a hack but it works...
…tMisdreavus
Fix title heading overlap in rust doc
Fixesrust-lang#45158.
To be noted that this margin only appears when a title is the first element.
<img width="1440" alt="screen shot 2017-10-22 at 16 08 44" src="https://user-images.githubusercontent.com/3050060/31862746-6411070e-b743-11e7-9a75-4159e1f7f1d6.png">
r? @rust-lang/docs
…be-adt-constructor, r=estebank
Document that call expressions also represent ADT constructors.
This is a rather obscure part of the language.
Optimize some span operations
Do not decode span data twice/thrice/etc unnecessarily.
Applied to stable hashing and all methods in `impl Span`.
Follow up to rust-lang#44646
r? @michaelwoerister
…=alexcrichton
Support Dragonfly when building Openssl
bootstrap: Add missing cputype matching for sparc64
Trying to configure rust natively on sparc64-unknown-linux-gnu currently fails with:
```
root@deb4g:/local_scratch/glaubitz/rust/rust# ./configure --host=sparc64-unknown-linux-gnu --enable-local-rust --local-rust-root=/usr/local
configure: processing command line
configure:
configure: build.host := ['sparc64-unknown-linux-gnu']
configure: build.rustc := /usr/local/bin/rustc
configure: build.cargo := /usr/local/bin/cargo
configure: build.rustc := /usr/local/bin/rustc
configure: build.cargo := /usr/local/bin/cargo
configure: build.configure-args := ['--host=sparc64-unknown-linux-gnu', '--enable ...
unknown cpu type: sparc64
root@deb4g:/local_scratch/glaubitz/rust/rust#
```
This is trivially fixed by defining sparc64 as a valid cputype.
…tr_note, r=estebank
edit and fix bad spacing of inner-attribute-not-allowed note
This multiline string literal was missing a backslash, leaving an awkward
newline and 35 spaces in the middle of the message.
But while we're here, the existing message seems kind of long in comparison to
similar notes: to cut it down, we excise the mentions of doc comments, which
seems sensible because we know that this erroneous attribute is not a doc
comment (notice the `is_sugared_doc: false` at the end of the function; if it
had been a doc comment, that error would get set in the `token::DocComment`
match branch of `parse_outer_attributes`).
…ielb1
Count type aliases used in patterns as usage by dead_code lint
Fixesrust-lang#45614.
Update doc comment for the Unix extension module
It was a bit outdated, claimed to be able to do less than it actually
could.
Add a hint what `BufRead` functions do on EOF
…bol-threshold, r=alexcrichton
Take crate-type into account when generating symbol export lists (linker version scripts)
r? @alexcrichton
cc rust-lang#45613
More fixes for x86_64-unknown-linux-gnux32
This update libc (all libc testing are passing) and fixes NR_GETRANDOM.
Fix all but one run-pass test (lto-unwind.rs, see rust-lang#45416)
…tebank
Suggest renaming import if names clash
Closesrust-lang#32354.
The output for the example in the issue looks like this:
```
~/p/local-rust-dev-testing ❯❯❯ cargo +local-s1 build
Compiling local-rust-dev-testing v0.1.0 (file:///home/cldfire/programming_projects/local-rust-dev-testing)
error[E0252]: the name `ConstructorExtension` is defined multiple times
--> src/main.rs:49:5
|
48 | use extension1::ConstructorExtension;
| -------------------------------- previous import of the trait `ConstructorExtension` here
49 | use extension2::ConstructorExtension;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `ConstructorExtension` reimported here
|
= note: `ConstructorExtension` must be defined only once in the type namespace of this module
help: You can use `as` to change the binding name of the import
|
49 | use extension2::ConstructorExtension as OtherConstructorExtension;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
```
This is my first PR that touches the compiler in any way, so if there's something else I need to do here (e.g. add a test), please let me know :).
Fix incorrect error type in Read::byte docs
None
Tidy: track rustc_const_unstable feature gates as well
This is important for the unstable book stub generation.
@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=14

@bors

bors commented Nov 1, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 0284550 has been approved by kennytm

@kennytmkennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 1, 2017
@bors

bors commented Nov 1, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0284550 with merge 7402866...

bors added a commit that referenced this pull request Nov 1, 2017
Rollup of 14 pull requests
- Successful merges: #45450, #45579, #45602, #45619, #45624, #45644, #45646, #45648, #45649, #45650, #45652, #45660, #45664, #45671
- Failed merges:
@bors

bors commented Nov 1, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 7402866 to master...

@bors
bors merged commit 0284550 into rust-lang:masterNov 1, 2017
@kennytm
kennytm deleted the rollup branch November 1, 2017 09:43
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

16 participants

@kennytm@bors@Centril@GuillaumeGomez@leoyvens@petrochenkov@mneumann@zackmdavis@sinkuu@tbu-@michaelwoerister@malbarbo@Cldfire@glaubitz@mbrubeck@est31