pub text: String,
pub krate: Option<String>,
pub deps: Vec<String>,
+ pub extern_prelude: Option<Vec<String>>,
pub cfg_atoms: Vec<String>,
pub cfg_key_values: Vec<(String, String)>,
pub edition: Option<String>,
if line.starts_with("//-") {
let meta = Fixture::parse_meta_line(line);
- res.push(meta)
+ res.push(meta);
} else {
if line.starts_with("// ")
&& line.contains(':')
&& !line.contains("::")
+ && !line.contains('.')
&& line.chars().all(|it| !it.is_uppercase())
{
- panic!("looks like invalid metadata line: {:?}", line)
+ panic!("looks like invalid metadata line: {:?}", line);
}
if let Some(entry) = res.last_mut() {
let mut krate = None;
let mut deps = Vec::new();
+ let mut extern_prelude = None;
let mut edition = None;
let mut cfg_atoms = Vec::new();
let mut cfg_key_values = Vec::new();
match key {
"crate" => krate = Some(value.to_string()),
"deps" => deps = value.split(',').map(|it| it.to_string()).collect(),
+ "extern-prelude" => {
+ if value.is_empty() {
+ extern_prelude = Some(Vec::new());
+ } else {
+ extern_prelude =
+ Some(value.split(',').map(|it| it.to_string()).collect::<Vec<_>>());
+ }
+ }
"edition" => edition = Some(value.to_string()),
"cfg" => {
for entry in value.split(',') {
}
}
+ for prelude_dep in extern_prelude.iter().flatten() {
+ assert!(
+ deps.contains(prelude_dep),
+ "extern-prelude {:?} must be a subset of deps {:?}",
+ extern_prelude,
+ deps
+ );
+ }
+
Fixture {
path,
text: String::new(),
krate,
deps,
+ extern_prelude,
cfg_atoms,
cfg_key_values,
edition,
let line = line.strip_prefix("//- minicore:").unwrap().trim();
for entry in line.split(", ") {
if res.has_flag(entry) {
- panic!("duplicate minicore flag: {:?}", entry)
+ panic!("duplicate minicore flag: {:?}", entry);
}
- res.activated_flags.push(entry.to_string())
+ res.activated_flags.push(entry.to_string());
}
res
// Fixed point loop to compute transitive closure of flags.
loop {
let mut changed = false;
- for &(u, v) in implications.iter() {
+ for &(u, v) in &implications {
if self.has_flag(u) && !self.has_flag(v) {
self.activated_flags.push(v.to_string());
changed = true;
}
if keep {
- buf.push_str(line)
+ buf.push_str(line);
}
if line_region {
active_regions.pop().unwrap();