Skip to content

Commit 449411f

Browse files
committed
Auto merge of #6837 - ehuss:remove-alt-reg-test, r=Eh2406
testsuite: cleanup for `alternative-registries` Remove some `alternative-registries` features that were accidentally left behind.
2 parents 0216dcd + c495e0a commit 449411f

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

tests/testsuite/package.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,6 @@ fn generated_manifest() {
771771
.file(
772772
"Cargo.toml",
773773
r#"
774-
cargo-features = ["alternative-registries"]
775-
776774
[project]
777775
name = "foo"
778776
version = "0.0.1"
@@ -816,8 +814,6 @@ fn generated_manifest() {
816814
# editing this file be aware that the upstream Cargo.toml
817815
# will likely look very different (and much more reasonable)
818816
819-
cargo-features = ["alternative-registries"]
820-
821817
[package]
822818
name = "foo"
823819
version = "0.0.1"

tests/testsuite/rename_deps.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ fn lots_of_names() {
8585
"Cargo.toml",
8686
&format!(
8787
r#"
88-
cargo-features = ["alternative-registries"]
8988
[package]
9089
name = "test"
9190
version = "0.1.0"

tests/testsuite/support/registry.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -445,19 +445,14 @@ impl Package {
445445
}
446446

447447
fn make_archive(&self) {
448-
let features = if self.deps.iter().any(|dep| dep.registry.is_some()) {
449-
"cargo-features = [\"alternative-registries\"]\n"
450-
} else {
451-
""
452-
};
453448
let mut manifest = format!(
454449
r#"
455-
{}[package]
450+
[package]
456451
name = "{}"
457452
version = "{}"
458453
authors = []
459454
"#,
460-
features, self.name, self.vers
455+
self.name, self.vers
461456
);
462457
for dep in self.deps.iter() {
463458
let target = match dep.target {

0 commit comments

Comments
 (0)