Skip to content

Rollup of 6 pull requests #30028

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

Merged
merged 15 commits into from
Nov 24, 2015
Merged

Rollup of 6 pull requests #30028

merged 15 commits into from
Nov 24, 2015

Conversation

Dylan McKay and others added 15 commits October 27, 2015 23:23
Previously the file was not regenrated upon modification of src/rustllvm or others.

Now it will be rebuilt if `src/llvm` or `src/rustllvm` is touched.

Also added *.rs rule to 'clean' rule so that it is removed upon 'make
clean'.
It was introduced with the change that made copy opt-in. The
implementation gives a warning, because the struct contains a raw
pointer.
The `log` crate on crates.io already knows TRACE, but the internal
liblog doesn't, which causes it to spew errors when a TRACE level is
defined.
looks like a case of mixed tabs and spaces
…excrichton

The `log` crate on crates.io already knows `TRACE`, but the internal liblog doesn't, which causes it to spew errors when a `TRACE` level is defined. I made `TRACE` behave like `DEBUG`.
Previously the file was not regenrated upon modification of `src/rustllvm` or others.

Now it will be rebuilt if `src/llvm` or `src/rustllvm` is touched.

Also added *.rs rule to 'clean' rule so that it is removed upon 'make
clean'.

Fixes rust-lang#28614.
…sakis

It was introduced with the change that made copy opt-in. The
implementation gives a warning, because the struct contains a raw
pointer.
…r, r=alexcrichton

Good candidate for a rollup, this one.
looks like a case of mixed tabs and spaces
`unit` was in code formatting, which is wrong, since it's not actual code. The correct code is `()`.
@steveklabnik
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Nov 24, 2015

📌 Commit 204fe21 has been approved by steveklabnik

@rust-highfive
Copy link
Contributor

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@steveklabnik steveklabnik assigned steveklabnik and unassigned brson Nov 24, 2015
@bors
Copy link
Collaborator

bors commented Nov 24, 2015

⌛ Testing commit 204fe21 with merge 1004860...

bors added a commit that referenced this pull request Nov 24, 2015
@bors bors merged commit 204fe21 into rust-lang:master Nov 24, 2015
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 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.

10 participants