Auto merge of #29215 - fhahn:issue-28157-bad-semicolon, r=alexcrichton
PR for #28157. At the moment, `rustc` emits a warning when a bare semicolon is encountered (could also be a fail, but I think this is a backwards incompatible change). Also I am not sure where the best place for a test for that warning would be. Seems run-pass tests do not check warnings.
This commit is contained in:
commit
8d86d1a4e1
src
doc
librustc/metadata
librustc_trans
librustdoc
libstd/sys/common
libterm/terminfo
libtest
@ -436,7 +436,7 @@ meta_seq : meta_item [ ',' meta_seq ] ? ;
|
||||
## Statements
|
||||
|
||||
```antlr
|
||||
stmt : decl_stmt | expr_stmt ;
|
||||
stmt : decl_stmt | expr_stmt | ';' ;
|
||||
```
|
||||
|
||||
### Declaration statements
|
||||
|
@ -207,7 +207,7 @@ impl CStore {
|
||||
visit(cstore, dep, ordering);
|
||||
}
|
||||
ordering.push(cnum);
|
||||
};
|
||||
}
|
||||
for (&num, _) in self.metas.borrow().iter() {
|
||||
visit(self, num, &mut ordering);
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ macro_rules! down_cast_data {
|
||||
data
|
||||
} else {
|
||||
$this.sess.span_bug($sp, &format!("unexpected data kind: {:?}", $id));
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -480,7 +480,7 @@ macro_rules! return_if_metadata_created_in_meantime {
|
||||
.find_metadata_for_unique_id($unique_type_id) {
|
||||
Some(metadata) => return MetadataCreationResult::new(metadata, true),
|
||||
None => { /* proceed normally */ }
|
||||
};
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -28,7 +28,7 @@ pub fn strip_hidden(krate: clean::Crate) -> plugins::PluginResult {
|
||||
let krate = {
|
||||
struct Stripper<'a> {
|
||||
stripped: &'a mut DefIdSet
|
||||
};
|
||||
}
|
||||
impl<'a> fold::DocFolder for Stripper<'a> {
|
||||
fn fold_item(&mut self, i: Item) -> Option<Item> {
|
||||
if i.is_hidden_from_doc() {
|
||||
@ -60,7 +60,7 @@ pub fn strip_hidden(krate: clean::Crate) -> plugins::PluginResult {
|
||||
let krate = {
|
||||
struct ImplStripper<'a> {
|
||||
stripped: &'a mut DefIdSet
|
||||
};
|
||||
}
|
||||
impl<'a> fold::DocFolder for ImplStripper<'a> {
|
||||
fn fold_item(&mut self, i: Item) -> Option<Item> {
|
||||
if let clean::ImplItem(clean::Impl{
|
||||
|
@ -1019,7 +1019,7 @@ mod tests {
|
||||
fn wtf8buf_from_iterator() {
|
||||
fn f(values: &[u32]) -> Wtf8Buf {
|
||||
values.iter().map(|&c| CodePoint::from_u32(c).unwrap()).collect::<Wtf8Buf>()
|
||||
};
|
||||
}
|
||||
assert_eq!(f(&[0x61, 0xE9, 0x20, 0x1F4A9]).bytes, b"a\xC3\xA9 \xF0\x9F\x92\xA9");
|
||||
|
||||
assert_eq!(f(&[0xD83D, 0xDCA9]).bytes, b"\xF0\x9F\x92\xA9"); // Magic!
|
||||
@ -1038,7 +1038,7 @@ mod tests {
|
||||
let mut string = initial.iter().map(c).collect::<Wtf8Buf>();
|
||||
string.extend(extended.iter().map(c));
|
||||
string
|
||||
};
|
||||
}
|
||||
|
||||
assert_eq!(e(&[0x61, 0xE9], &[0x20, 0x1F4A9]).bytes,
|
||||
b"a\xC3\xA9 \xF0\x9F\x92\xA9");
|
||||
|
@ -102,7 +102,7 @@ fn test_get_dbpath_for_term() {
|
||||
fn x(t: &str) -> String {
|
||||
let p = get_dbpath_for_term(t).expect("no terminfo entry found");
|
||||
p.to_str().unwrap().to_string()
|
||||
};
|
||||
}
|
||||
assert!(x("screen") == "/usr/share/terminfo/s/screen");
|
||||
assert!(get_dbpath_for_term("") == None);
|
||||
env::set_var("TERMINFO_DIRS", ":");
|
||||
|
@ -924,7 +924,7 @@ pub fn filter_tests(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> Vec<TestDescA
|
||||
} else {
|
||||
None
|
||||
}
|
||||
};
|
||||
}
|
||||
filtered.into_iter().filter_map(filter).collect()
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user