Skip to content

Commit e7f2374

Browse files
committed
Rename Everything to Default to avoid confusion
1 parent 263548d commit e7f2374

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/bin/run.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
9292
release: options.flag_release,
9393
mode: ops::CompileMode::Build,
9494
filter: if examples.is_empty() && bins.is_empty() {
95-
ops::CompileFilter::Everything { required_features_filterable: false, }
95+
ops::CompileFilter::Default { required_features_filterable: false, }
9696
} else {
9797
ops::CompileFilter::new(false,
9898
&bins, false,

src/cargo/ops/cargo_compile.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl<'a> CompileOptions<'a> {
7878
spec: ops::Packages::Packages(&[]),
7979
mode: mode,
8080
release: false,
81-
filter: CompileFilter::Everything { required_features_filterable: false },
81+
filter: CompileFilter::Default { required_features_filterable: false },
8282
message_format: MessageFormat::Human,
8383
target_rustdoc_args: None,
8484
target_rustc_args: None,
@@ -154,7 +154,7 @@ pub enum FilterRule<'a> {
154154
}
155155

156156
pub enum CompileFilter<'a> {
157-
Everything {
157+
Default {
158158
/// Flag whether targets can be safely skipped when required-features are not satisfied.
159159
required_features_filterable: bool,
160160
},
@@ -381,15 +381,15 @@ impl<'a> CompileFilter<'a> {
381381
tests: rule_tsts,
382382
}
383383
} else {
384-
CompileFilter::Everything {
384+
CompileFilter::Default {
385385
required_features_filterable: true,
386386
}
387387
}
388388
}
389389

390390
pub fn matches(&self, target: &Target) -> bool {
391391
match *self {
392-
CompileFilter::Everything { .. } => true,
392+
CompileFilter::Default { .. } => true,
393393
CompileFilter::Only { lib, bins, examples, tests, benches } => {
394394
let rule = match *target.kind() {
395395
TargetKind::Bin => bins,
@@ -407,7 +407,7 @@ impl<'a> CompileFilter<'a> {
407407

408408
pub fn is_specific(&self) -> bool {
409409
match *self {
410-
CompileFilter::Everything { .. } => false,
410+
CompileFilter::Default { .. } => false,
411411
CompileFilter::Only { .. } => true,
412412
}
413413
}
@@ -589,7 +589,7 @@ fn generate_targets<'a>(pkg: &'a Package,
589589
};
590590

591591
let targets = match *filter {
592-
CompileFilter::Everything { required_features_filterable } => {
592+
CompileFilter::Default { required_features_filterable } => {
593593
let deps = if release {
594594
&profiles.bench_deps
595595
} else {

src/cargo/ops/cargo_install.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ fn find_duplicates(dst: &Path,
401401
}
402402
};
403403
match *filter {
404-
CompileFilter::Everything { .. } => {
404+
CompileFilter::Default { .. } => {
405405
pkg.targets().iter()
406406
.filter(|t| t.is_bin())
407407
.filter_map(|t| check(t.name().to_string()))

src/cargo/ops/cargo_package.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ fn run_verify(ws: &Workspace, tar: &File, opts: &PackageOpts) -> CargoResult<()>
299299
no_default_features: false,
300300
all_features: false,
301301
spec: ops::Packages::Packages(&[]),
302-
filter: ops::CompileFilter::Everything { required_features_filterable: true },
302+
filter: ops::CompileFilter::Default { required_features_filterable: true },
303303
release: false,
304304
message_format: ops::MessageFormat::Human,
305305
mode: ops::CompileMode::Build,

0 commit comments

Comments
 (0)