Skip to content

Commit 0c3851c

Browse files
author
Jonathan Claudius
committed
HTTPS all the things
1 parent d75d1fb commit 0c3851c

20 files changed

+61
-61
lines changed

‎LICENSE-APACHE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Apache License
22
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
3+
https://www.apache.org/licenses/LICENSE-2.0
44

55
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
66

@@ -192,7 +192,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.
193193
You may obtain a copy of the License at
194194

195-
http://www.apache.org/licenses/LICENSE-2.0
195+
https://www.apache.org/licenses/LICENSE-2.0
196196

197197
Unless required by applicable law or agreed to in writing, software
198198
distributed under the License is distributed on an "AS IS" BASIS,

‎LICENSE-THIRD-PARTY

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ depends on a number of libraries which carry their own copyright notices and
33
license terms. These libraries are normally all linked static into the binary
44
distributions of Cargo:
55

6-
* OpenSSL - http://www.openssl.org/source/license.html
6+
* OpenSSL - https://www.openssl.org/source/license.html
77

88
Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved.
99

@@ -22,7 +22,7 @@ distributions of Cargo:
2222
3. All advertising materials mentioning features or use of this
2323
software must display the following acknowledgment:
2424
"This product includes software developed by the OpenSSL Project
25-
for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
25+
for use in the OpenSSL Toolkit. (https://www.openssl.org/)"
2626

2727
4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
2828
endorse or promote products derived from this software without
@@ -36,7 +36,7 @@ distributions of Cargo:
3636
6. Redistributions of any form whatsoever must retain the following
3737
acknowledgment:
3838
"This product includes software developed by the OpenSSL Project
39-
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
39+
for use in the OpenSSL Toolkit (https://www.openssl.org/)"
4040

4141
THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
4242
EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -1037,7 +1037,7 @@ distributions of Cargo:
10371037

10381038
----------------------------------------------------------------------
10391039

1040-
* libssh2 - http://www.libssh2.org/license.html
1040+
* libssh2 - https://www.libssh2.org/license.html
10411041

10421042
Copyright (c) 2004-2007 Sara Golemon <sarag@libssh2.org>
10431043
Copyright (c) 2005,2006 Mikhail Gusarov <dottedmag@dottedmag.net>
@@ -1080,7 +1080,7 @@ distributions of Cargo:
10801080
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
10811081
OF SUCH DAMAGE.
10821082

1083-
* libcurl - http://curl.haxx.se/docs/copyright.html
1083+
* libcurl - https://curl.haxx.se/docs/copyright.html
10841084

10851085
COPYRIGHT AND PERMISSION NOTICE
10861086

@@ -1268,5 +1268,5 @@ distributions of Cargo:
12681268
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
12691269
OTHER DEALINGS IN THE SOFTWARE.
12701270

1271-
For more information, please refer to <http://unlicense.org/>
1271+
For more information, please refer to <https://unlicense.org/>
12721272

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ See LICENSE-APACHE and LICENSE-MIT for details.
7878
### Third party software
7979

8080
This product includes software developed by the OpenSSL Project
81-
for use in the OpenSSL Toolkit (http://www.openssl.org/).
81+
for use in the OpenSSL Toolkit (https://www.openssl.org/).
8282

8383
In binary form, this product includes software that is licensed under the
8484
terms of the GNU General Public License, version 2, with a linking exception,

‎src/bin/cargo/commands/pkgid.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Example Package IDs
2727
crates.io/foo | foo | * | *://crates.io/foo
2828
crates.io/foo#1.2.3 | foo | 1.2.3 | *://crates.io/foo
2929
crates.io/bar#foo:1.2.3 | foo | 1.2.3 | *://crates.io/bar
30-
http://crates.io/foo#1.2.3 | foo | 1.2.3 | http://crates.io/foo
30+
https://crates.io/foo#1.2.3 | foo | 1.2.3 | https://crates.io/foo
3131
",
3232
)
3333
}

‎src/cargo/core/package_id_spec.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ impl PackageIdSpec {
3535
/// use cargo::core::PackageIdSpec;
3636
///
3737
/// let specs = vec![
38-
/// "http://crates.io/foo#1.2.3",
39-
/// "http://crates.io/foo#bar:1.2.3",
38+
/// "https://crates.io/foo#1.2.3",
39+
/// "https://crates.io/foo#bar:1.2.3",
4040
/// "crates.io/foo",
4141
/// "crates.io/foo#1.2.3",
4242
/// "crates.io/foo#bar",
@@ -286,19 +286,19 @@ mod tests {
286286
}
287287

288288
ok(
289-
"http://crates.io/foo#1.2.3",
289+
"https://crates.io/foo#1.2.3",
290290
PackageIdSpec {
291291
name: "foo".to_string(),
292292
version: Some("1.2.3".to_semver().unwrap()),
293-
url: Some(Url::parse("http://crates.io/foo").unwrap()),
293+
url: Some(Url::parse("https://crates.io/foo").unwrap()),
294294
},
295295
);
296296
ok(
297-
"http://crates.io/foo#bar:1.2.3",
297+
"https://crates.io/foo#bar:1.2.3",
298298
PackageIdSpec {
299299
name: "bar".to_string(),
300300
version: Some("1.2.3".to_semver().unwrap()),
301-
url: Some(Url::parse("http://crates.io/foo").unwrap()),
301+
url: Some(Url::parse("https://crates.io/foo").unwrap()),
302302
},
303303
);
304304
ok(
@@ -356,13 +356,13 @@ mod tests {
356356
assert!(PackageIdSpec::parse("baz:").is_err());
357357
assert!(PackageIdSpec::parse("baz:*").is_err());
358358
assert!(PackageIdSpec::parse("baz:1.0").is_err());
359-
assert!(PackageIdSpec::parse("http://baz:1.0").is_err());
360-
assert!(PackageIdSpec::parse("http://#baz:1.0").is_err());
359+
assert!(PackageIdSpec::parse("https://baz:1.0").is_err());
360+
assert!(PackageIdSpec::parse("https://#baz:1.0").is_err());
361361
}
362362

363363
#[test]
364364
fn matching() {
365-
let url = Url::parse("http://example.com").unwrap();
365+
let url = Url::parse("https://example.com").unwrap();
366366
let sid = SourceId::for_registry(&url).unwrap();
367367
let foo = PackageId::new("foo", "1.2.3", sid).unwrap();
368368
let bar = PackageId::new("bar", "1.2.3", sid).unwrap();

‎src/cargo/ops/cargo_package.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ fn check_metadata(pkg: &Package, config: &Config) -> CargoResult<()> {
152152

153153
config.shell().warn(&format!(
154154
"manifest has no {things}.\n\
155-
See http://doc.crates.io/manifest.html#package-metadata for more info.",
155+
See https://doc.rust-lang.org/cargo/reference/manifest.html for more info.",
156156
things = things
157157
))?
158158
}

‎src/cargo/ops/common_for_install_and_uninstall.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ where
9292
"the `--vers` provided, `{}`, is \
9393
not a valid semver version requirement\n\n
9494
Please have a look at \
95-
http://doc.crates.io/specifying-dependencies.html \
95+
https://doc.crates.io/specifying-dependencies.html \
9696
for the correct format",
9797
v
9898
),

‎src/cargo/ops/registry.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ fn transmit(
290290
the following are not valid badges and were ignored: {}. \
291291
Either the badge type specified is unknown or a required \
292292
attribute is missing. Please see \
293-
http://doc.crates.io/manifest.html#package-metadata \
293+
https://doc.rust-lang.org/cargo/reference/manifest.html \
294294
for valid badge types and their required attributes.",
295295
warnings.invalid_badges.join(", ")
296296
);
@@ -763,7 +763,7 @@ pub fn search(
763763
);
764764
} else if total_crates > limit && limit >= search_max_limit {
765765
println!(
766-
"... and {} crates more (go to http://crates.io/search?q={} to see more)",
766+
"... and {} crates more (go to https://crates.io/search?q={} to see more)",
767767
total_crates - limit,
768768
percent_encode(query.as_bytes(), QUERY_ENCODE_SET)
769769
);

‎src/doc/man/cargo.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cargo - The Rust package manager
1717
== DESCRIPTION
1818

1919
This program is a package manager and build tool for the Rust language,
20-
available at <http://rust-lang.org>.
20+
available at <https://rust-lang.org>.
2121

2222
== COMMANDS
2323

‎src/doc/man/generated/cargo.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="_description">DESCRIPTION</h2>
1919
<div class="sectionbody">
2020
<div class="paragraph">
2121
<p>This program is a package manager and build tool for the Rust language,
22-
available at <a href="http://rust-lang.org" class="bare">http://rust-lang.org</a>.</p>
22+
available at <a href="https://rust-lang.org" class="bare">https://rust-lang.org</a>.</p>
2323
</div>
2424
</div>
2525
</div>

‎src/doc/src/reference/manifest.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ name such as "nul", is not too long, etc.
3232
#### The `version` field
3333

3434
Cargo bakes in the concept of [Semantic
35-
Versioning](http://semver.org/), so make sure you follow some basic rules:
35+
Versioning](https://semver.org/), so make sure you follow some basic rules:
3636

3737
* Before you reach 1.0.0, anything goes, but if you make breaking changes,
3838
increment the minor version. In Rust, breaking changes include adding fields to

‎src/doc/src/reference/pkgid-spec.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ registry at `crates.io`
3434
| `crates.io/foo` | `foo` | `*` | `*://crates.io/foo` |
3535
| `crates.io/foo#1.2.3` | `foo` | `1.2.3` | `*://crates.io/foo` |
3636
| `crates.io/bar#foo:1.2.3` | `foo` | `1.2.3` | `*://crates.io/bar` |
37-
| `http://crates.io/foo#1.2.3` | `foo` | `1.2.3` | `http://crates.io/foo` |
37+
| `https://crates.io/foo#1.2.3`| `foo` | `1.2.3` | `https://crates.io/foo` |
3838

3939
#### Brevity of specifications
4040

‎src/etc/man/cargo.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ cargo \- The Rust package manager
4444
.sp
4545
This program is a package manager and build tool for the Rust language,
4646
available at \c
47-
.URL "http://rust\-lang.org" "" "."
47+
.URL "https://rust\-lang.org" "" "."
4848
.SH "COMMANDS"
4949
.SS "Build Commands"
5050
.sp

‎tests/testsuite/bad_config.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ fn bad_source_config2() {
910910
".cargo/config",
911911
r#"
912912
[source.crates-io]
913-
registry = 'http://example.com'
913+
registry = 'https://example.com'
914914
replace-with = 'bar'
915915
"#,
916916
)
@@ -953,7 +953,7 @@ fn bad_source_config3() {
953953
".cargo/config",
954954
r#"
955955
[source.crates-io]
956-
registry = 'http://example.com'
956+
registry = 'https://example.com'
957957
replace-with = 'crates-io'
958958
"#,
959959
)
@@ -995,11 +995,11 @@ fn bad_source_config4() {
995995
".cargo/config",
996996
r#"
997997
[source.crates-io]
998-
registry = 'http://example.com'
998+
registry = 'https://example.com'
999999
replace-with = 'bar'
10001000
10011001
[source.bar]
1002-
registry = 'http://example.com'
1002+
registry = 'https://example.com'
10031003
replace-with = 'crates-io'
10041004
"#,
10051005
)
@@ -1042,7 +1042,7 @@ fn bad_source_config5() {
10421042
".cargo/config",
10431043
r#"
10441044
[source.crates-io]
1045-
registry = 'http://example.com'
1045+
registry = 'https://example.com'
10461046
replace-with = 'bar'
10471047
10481048
[source.bar]
@@ -1115,7 +1115,7 @@ fn bad_source_config6() {
11151115
".cargo/config",
11161116
r#"
11171117
[source.crates-io]
1118-
registry = 'http://example.com'
1118+
registry = 'https://example.com'
11191119
replace-with = ['not', 'a', 'string']
11201120
"#,
11211121
)
@@ -1176,7 +1176,7 @@ fn bad_source_config7() {
11761176
".cargo/config",
11771177
r#"
11781178
[source.foo]
1179-
registry = 'http://example.com'
1179+
registry = 'https://example.com'
11801180
local-registry = 'file:///another/file'
11811181
"#,
11821182
)

‎tests/testsuite/build.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1446,8 +1446,8 @@ fn crate_env_vars() {
14461446
name = "foo"
14471447
version = "0.5.1-alpha.1"
14481448
description = "This is foo"
1449-
homepage = "http://example.com"
1450-
repository = "http://example.com/repo.git"
1449+
homepage = "https://example.com"
1450+
repository = "https://example.com/repo.git"
14511451
authors = ["wycats@example.com"]
14521452
"#,
14531453
)
@@ -1475,8 +1475,8 @@ fn crate_env_vars() {
14751475
assert_eq!(s, foo::version());
14761476
println!("{}", s);
14771477
assert_eq!("foo", PKG_NAME);
1478-
assert_eq!("http://example.com", HOMEPAGE);
1479-
assert_eq!("http://example.com/repo.git", REPOSITORY);
1478+
assert_eq!("https://example.com", HOMEPAGE);
1479+
assert_eq!("https://example.com/repo.git", REPOSITORY);
14801480
assert_eq!("This is foo", DESCRIPTION);
14811481
let s = format!("{}.{}.{}-{}", VERSION_MAJOR,
14821482
VERSION_MINOR, VERSION_PATCH, VERSION_PRE);

‎tests/testsuite/build_auth.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fn http_auth_offered() {
105105
authors = []
106106
107107
[dependencies.bar]
108-
git = "http://127.0.0.1:{}/foo/bar"
108+
git = "https://127.0.0.1:{}/foo/bar"
109109
"#,
110110
addr.port()
111111
),
@@ -126,11 +126,11 @@ fn http_auth_offered() {
126126
.with_status(101)
127127
.with_stderr_contains(&format!(
128128
"\
129-
[UPDATING] git repository `http://{addr}/foo/bar`
129+
[UPDATING] git repository `https://{addr}/foo/bar`
130130
[ERROR] failed to load source for a dependency on `bar`
131131
132132
Caused by:
133-
Unable to update http://{addr}/foo/bar
133+
Unable to update https://{addr}/foo/bar
134134
135135
Caused by:
136136
failed to clone into: [..]

‎tests/testsuite/git.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2714,7 +2714,7 @@ fn failed_submodule_checkout() {
27142714
});
27152715

27162716
let repo = git2::Repository::open(&git_project2.root()).unwrap();
2717-
let url = format!("http://{}:{}/", addr.ip(), addr.port());
2717+
let url = format!("https://{}:{}/", addr.ip(), addr.port());
27182718
{
27192719
let mut s = repo.submodule(&url, Path::new("bar"), false).unwrap();
27202720
let subrepo = s.open().unwrap();

0 commit comments

Comments
 (0)