Skip to content

Commit ddfaf10

Browse files
Add error code flag
1 parent 7746d7c commit ddfaf10

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

src/librustc_privacy/diagnostics.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ E0445: r##"
1616
A private trait was used on a public type parameter bound. Erroneous code
1717
examples:
1818
19-
```compile_fail
19+
```compile_fail,E0445
2020
#![deny(private_in_public)]
2121
2222
trait Foo {
@@ -46,7 +46,7 @@ pub fn foo<T: Foo> (t: T) {} // ok!
4646
E0446: r##"
4747
A private type was used in a public type signature. Erroneous code example:
4848
49-
```compile_fail
49+
```compile_fail,E0446
5050
#![deny(private_in_public)]
5151
5252
mod Foo {
@@ -100,7 +100,7 @@ pub enum Foo {
100100
Since the enum is already public, adding `pub` on one its elements is
101101
unnecessary. Example:
102102
103-
```compile_fail
103+
```compile_fail,
104104
enum Foo {
105105
pub Bar, // not ok!
106106
}
@@ -119,7 +119,7 @@ E0450: r##"
119119
A tuple constructor was invoked while some of its fields are private. Erroneous
120120
code example:
121121
122-
```compile_fail
122+
```compile_fail,E0450
123123
mod Bar {
124124
pub struct Foo(isize);
125125
}
@@ -157,7 +157,7 @@ let f = bar::Foo::new(1);
157157
E0451: r##"
158158
A struct constructor with private fields was invoked. Erroneous code example:
159159
160-
```compile_fail
160+
```compile_fail,E0451
161161
mod Bar {
162162
pub struct Foo {
163163
pub a: isize,

src/librustdoc/html/markdown.rs

+15-12
Original file line numberDiff line numberDiff line change
@@ -605,18 +605,21 @@ mod tests {
605605
}
606606

607607
// marker | should_panic| no_run| ignore| rust | test_harness| compile_fail
608-
t("", false, false, false, true, false, false);
609-
t("rust", false, false, false, true, false, false);
610-
t("sh", false, false, false, false, false, false);
611-
t("ignore", false, false, true, true, false, false);
612-
t("should_panic", true, false, false, true, false, false);
613-
t("no_run", false, true, false, true, false, false);
614-
t("test_harness", false, false, false, true, true, false);
615-
t("compile_fail", false, true, false, true, false, true);
616-
t("{.no_run .example}", false, true, false, true, false, false);
617-
t("{.sh .should_panic}", true, false, false, true, false, false);
618-
t("{.example .rust}", false, false, false, true, false, false);
619-
t("{.test_harness .rust}", false, false, false, true, true, false);
608+
// | error_codes
609+
t("", false, false, false, true, false, false, Vec::new());
610+
t("rust", false, false, false, true, false, false, Vec::new());
611+
t("sh", false, false, false, false, false, false, Vec::new());
612+
t("ignore", false, false, true, true, false, false, Vec::new());
613+
t("should_panic", true, false, false, true, false, false, Vec::new());
614+
t("no_run", false, true, false, true, false, false, Vec::new());
615+
t("test_harness", false, false, false, true, true, false, Vec::new());
616+
t("compile_fail", false, true, false, true, false, true, Vec::new());
617+
t("E0450", false, false, false, true, false, false,
618+
vec!("E0450".to_owned()));
619+
t("{.no_run .example}", false, true, false, true, false, false, Vec::new());
620+
t("{.sh .should_panic}", true, false, false, true, false, false, Vec::new());
621+
t("{.example .rust}", false, false, false, true, false, false, Vec::new());
622+
t("{.test_harness .rust}", false, false, false, true, true, false, Vec::new());
620623
}
621624

622625
#[test]

src/librustdoc/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ fn runtest(test: &str, cratename: &str, cfgs: Vec<String>, libs: SearchPaths,
275275
}
276276
if count > 0 && error_codes.len() > 0 {
277277
let out = String::from_utf8(data.lock().unwrap().to_vec()).unwrap();
278-
error_codes = error_codes.into_iter().filter(|err| !out.contains(err)).collect();
278+
error_codes.retain(|err| !out.contains(err));
279279
}
280280
}
281281
Ok(()) if compile_fail => panic!("test compiled while it wasn't supposed to"),

0 commit comments

Comments
 (0)