Skip to content

Rollup of 9 pull requests - #52303

Merged
bors merged 20 commits into
rust-lang:masterfrom
kennytm:rollup
Jul 12, 2018
Merged

Rollup of 9 pull requests#52303
bors merged 20 commits into
rust-lang:masterfrom
kennytm:rollup

Conversation

@kennytm

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

mbrubeckand others added 20 commits July 6, 2018 12:57
If you are using a hard-linked file as your config.toml, this change will affect the way other instances of the file is modified.
The original version would modify all other instances whereas the new version will leave others unchanged, reducing the ref count by one.
Signed-off-by: NODA, Kai <nodakai@gmail.com>
This is a tricky operation to implement on Win32; see
https://ci.appveyor.com/project/nodakai/python-win-behavior
Signed-off-by: NODA, Kai <nodakai@gmail.com>
The previous syntax was causing rustdoc to interpret them as links.
... and perform the same verification for #[proc_macro_attribute], currently
neither of these attributes take any arguments.
Closesrust-lang#52273
bootstrap: write texts to a .tmp file first for atomicity
If you are using a hard-linked file as your config.toml, this change will affect the way other instances of the file is modified.
The original version would modify all other instances whereas the new version will leave others unchanged, reducing the ref count by one.
…excrichton
impl Clone for Box<CStr>, Box<OsStr>, Box<Path>
Implements rust-lang#51908.
use proper footnote syntax for references
The previous syntax was causing rustdoc to interpret them as links.
Deny bare trait objects in `src/bootstrap`
Enforce `#![deny(bare_trait_objects)]` in `src/bootstrap`.
…tr, r=petrochenkov
rustc: Verify #[proc_macro] is only a word
... and perform the same verification for #[proc_macro_attribute], currently
neither of these attributes take any arguments.
Closesrust-lang#52273
…ochenkov
Deny bare trait objects in src/librustc_resolve
Enforce `#![deny(bare_trait_objects)]` in `src/librustc_resolve`.
…enkov
Deny bare trait objects in src/libsyntax_ext
Enforce `#![deny(bare_trait_objects)]` in `src/libsyntax_ext`.
make reference to dirs crate clickable in terminals
Currently I have to copy-paste the link; with this change I can just click it right in my terminal window.
@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=9

@bors

bors commented Jul 12, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit a7c2c68 has been approved by kennytm

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 12, 2018
@bors

bors commented Jul 12, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a7c2c68 with merge 7db82cc...

bors added a commit that referenced this pull request Jul 12, 2018
Rollup of 9 pull requests
Successful merges:
- #51816 (bootstrap: write texts to a .tmp file first for atomicity)
- #51912 (impl Clone for Box<CStr>, Box<OsStr>, Box<Path>)
- #52164 (use proper footnote syntax for references)
- #52220 (Deny bare trait objects in `src/bootstrap`)
- #52276 (rustc: Verify #[proc_macro] is only a word)
- #52277 (Uncapitalize "If")
- #52287 (Deny bare trait objects in src/librustc_resolve)
- #52295 (Deny bare trait objects in src/libsyntax_ext)
- #52298 (make reference to dirs crate clickable in terminals)
Failed merges:
r? @ghost
@bors

bors commented Jul 12, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit a7c2c68 into rust-lang:masterJul 12, 2018
@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.

10 participants

@kennytm@bors@Centril@mbrubeck@nodakai@ljedrz@euclio@alexcrichton@kraai@RalfJung