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

doc: trim some needless code #33442

Merged
merged 2 commits into from
May 7, 2016
Merged

doc: trim some needless code #33442

merged 2 commits into from
May 7, 2016

Conversation

tshepang
Copy link
Member

@tshepang tshepang commented May 5, 2016

No description provided.

@rust-highfive
Copy link
Collaborator

r? @brson

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

@@ -607,7 +607,7 @@ opt dist-host-only 0 "only install bins for the host architecture"
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
opt llvm-version-check 1 "check if the LLVM version is supported, build anyway"
opt rustbuild 0 "use the rust and cargo based build system"
opt orbit 0 "get MIR where it belongs - everywhere; most importantly, in orbit"
opt orbit 1 "get MIR where it belongs - everywhere; most importantly, in orbit"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we probably don't want to change this default in this patch 😄

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically, this might be based on the master proper, but we had to rewrite its history a bit because of this being an accidental push.

@tshepang could you rebase onto the current master please?

@tshepang
Copy link
Member Author

tshepang commented May 6, 2016

another attempt

@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented May 6, 2016

📌 Commit 9f935c8 has been approved by steveklabnik

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 7, 2016
steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 7, 2016
steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 7, 2016
bors added a commit that referenced this pull request May 7, 2016
@bors bors merged commit 9f935c8 into rust-lang:master May 7, 2016
@tshepang tshepang deleted the trim branch May 9, 2016 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants