Skip to content

Commit 3231fd3

Browse files
committed
Auto merge of #5381 - dwijnand:github-casing, r=alexcrichton
Fix how GitHub is written just a silly PR - I noticed it in the README, and applied it repo-wide.
2 parents ae41c6c + 43914c5 commit 3231fd3

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Cargo releases coincide with Rust releases.
5959

6060
Found a bug? We'd love to know about it!
6161

62-
Please report all issues on the github [issue tracker][issues].
62+
Please report all issues on the GitHub [issue tracker][issues].
6363

6464
[issues]: https://github.com/rust-lang/cargo/issues
6565

src/cargo/sources/git/source.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub fn canonicalize_url(url: &Url) -> CargoResult<Url> {
8989
url.path_segments_mut().unwrap().pop_if_empty();
9090
}
9191

92-
// HACKHACK: For github URL's specifically just lowercase
92+
// HACKHACK: For GitHub URL's specifically just lowercase
9393
// everything. GitHub treats both the same, but they hash
9494
// differently, and we're gonna be hashing them. This wants a more
9595
// general solution, and also we're almost certainly not using the

src/cargo/sources/git/utils.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -671,12 +671,12 @@ pub fn fetch(
671671
bail!("can't update a git repository in the offline mode")
672672
}
673673

674-
// If we're fetching from github, attempt github's special fast path for
674+
// If we're fetching from GitHub, attempt GitHub's special fast path for
675675
// testing if we've already got an up-to-date copy of the repository
676676
if url.host_str() == Some("github.com") {
677677
if let Ok(oid) = repo.refname_to_id("refs/remotes/origin/master") {
678678
let mut handle = config.http()?.borrow_mut();
679-
debug!("attempting github fast path for {}", url);
679+
debug!("attempting GitHub fast path for {}", url);
680680
if github_up_to_date(&mut handle, url, &oid) {
681681
return Ok(());
682682
} else {
@@ -821,7 +821,7 @@ fn reinitialize(repo: &mut git2::Repository) -> CargoResult<()> {
821821
}
822822

823823
/// Updating the index is done pretty regularly so we want it to be as fast as
824-
/// possible. For registries hosted on github (like the crates.io index) there's
824+
/// possible. For registries hosted on GitHub (like the crates.io index) there's
825825
/// a fast path available to use [1] to tell us that there's no updates to be
826826
/// made.
827827
///
@@ -844,7 +844,7 @@ fn github_up_to_date(handle: &mut Easy, url: &Url, oid: &git2::Oid) -> bool {
844844
})
845845
}
846846

847-
// This expects github urls in the form `github.com/user/repo` and nothing
847+
// This expects GitHub urls in the form `github.com/user/repo` and nothing
848848
// else
849849
let mut pieces = try!(url.path_segments());
850850
let username = try!(pieces.next());

0 commit comments

Comments
 (0)