summaryrefslogtreecommitdiffstats
path: root/vendor/gix-attributes/src
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/gix-attributes/src')
-rw-r--r--vendor/gix-attributes/src/lib.rs6
-rw-r--r--vendor/gix-attributes/src/search/outcome.rs4
2 files changed, 5 insertions, 5 deletions
diff --git a/vendor/gix-attributes/src/lib.rs b/vendor/gix-attributes/src/lib.rs
index 7eaac4282..812ffe49a 100644
--- a/vendor/gix-attributes/src/lib.rs
+++ b/vendor/gix-attributes/src/lib.rs
@@ -2,10 +2,10 @@
//!
//! ## Feature Flags
#![cfg_attr(
- feature = "document-features",
- cfg_attr(doc, doc = ::document_features::document_features!())
+ all(doc, feature = "document-features"),
+ doc = ::document_features::document_features!()
)]
-#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+#![cfg_attr(all(doc, feature = "document-features"), feature(doc_cfg, doc_auto_cfg))]
#![deny(missing_docs, rust_2018_idioms, unsafe_code)]
pub use gix_glob as glob;
diff --git a/vendor/gix-attributes/src/search/outcome.rs b/vendor/gix-attributes/src/search/outcome.rs
index 7cea3bd19..41d70e580 100644
--- a/vendor/gix-attributes/src/search/outcome.rs
+++ b/vendor/gix-attributes/src/search/outcome.rs
@@ -54,8 +54,6 @@ impl Outcome {
collection: &MetadataCollection,
attribute_names: &mut dyn Iterator<Item = KStringRef<'_>>,
) {
- self.initialize(collection);
-
self.selected.clear();
self.selected.extend(attribute_names.map(|name| {
(
@@ -63,6 +61,8 @@ impl Outcome {
collection.name_to_meta.get(name.as_str()).map(|meta| meta.id),
)
}));
+
+ self.initialize(collection);
self.reset_remaining();
}