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/guide/dependencies: Add a 'rust' language marker #4921

Merged
merged 1 commit into from
Jan 9, 2018

Conversation

wking
Copy link
Contributor

@wking wking commented Jan 8, 2018

This had been added to the non-book docs in 2ad45a5 (#4455), despite the fact that the book didn't actually have that marker:

$ git cat-file -p 2ad45a56:src/doc/book/src/guide/dependencies.md | grep -A2 'You can now use the'
You can now use the `regex` library using `extern crate` in `main.rs`.

```

This is (along with the already-landed #4916), part of recovering from #4904.

This had been added to the non-book docs in 2ad45a5 ([doc] Sync back
doc/book changes into old docs, 2017-08-31, rust-lang#4455), despite the fact
that the book didn't actually have that marker:

  $ git cat-file -p 2ad45a5:src/doc/book/src/guide/dependencies.md | grep -A2 'You can now use the'
  You can now use the `regex` library using `extern crate` in `main.rs`.

  ```
@rust-highfive
Copy link

r? @steveklabnik

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

@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Collaborator

bors commented Jan 8, 2018

📌 Commit 2722274 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Jan 9, 2018

⌛ Testing commit 2722274 with merge 1fc8797...

bors added a commit that referenced this pull request Jan 9, 2018
doc/guide/dependencies: Add a 'rust' language marker

This had been added to the non-book docs in 2ad45a5 (#4455), despite the fact that the book didn't actually have that marker:

    $ git cat-file -p 2ad45a5:src/doc/book/src/guide/dependencies.md | grep -A2 'You can now use the'
    You can now use the `regex` library using `extern crate` in `main.rs`.

    ```

This is (along with the already-landed #4916), part of recovering from #4904.
@bors
Copy link
Collaborator

bors commented Jan 9, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 1fc8797 to master...

@bors bors merged commit 2722274 into rust-lang:master Jan 9, 2018
@ehuss ehuss added this to the 1.25.0 milestone Feb 6, 2022
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