rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

mk: Run doc tests with --cfg dox

Browse Source 
There were a few examples in the macros::builtin module that weren't being run
because they were being #[cfg]'d out.

Closes #14697
This commit is contained in:
Alex Crichton
2014-06-06 09:22:19 -07:00
parent 1f4d8f924e
commit cb12e7ab74
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mk/tests.mk
View File

@@ -818,7 +818,7 @@ endif
ifeq ($(2),$$(CFG_BUILD)) ifeq ($(2),$$(CFG_BUILD))
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)): $$(CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4)) $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)): $$(CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4))
@$$(call E, run doc-crate-$(4) [$(2)]) @$$(call E, run doc-crate-$(4) [$(2)])
$$(Q)$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test \ $$(Q)$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test --cfg dox \
$$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@ $$(CRATEFILE_$(4)) --test-args "$$(TESTARGS)" && touch $$@
else else
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)): $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-crate-$(4)):

6
src/libstd/macros.rs
View File

@@ -465,7 +465,7 @@ pub mod builtin {
/// ``` /// ```
/// let rust = bytes!("r", 'u', "st", 255); /// let rust = bytes!("r", 'u', "st", 255);
/// assert_eq!(rust[1], 'u' as u8); /// assert_eq!(rust[1], 'u' as u8);
/// assert_eq!(rust[5], 255); /// assert_eq!(rust[4], 255);
/// ``` /// ```
#[macro_export] #[macro_export]
macro_rules! bytes( ($($e:expr),*) => ({ /* compiler built-in */ }) ) macro_rules! bytes( ($($e:expr),*) => ({ /* compiler built-in */ }) )
@@ -482,10 +482,14 @@ pub mod builtin {
/// # Example /// # Example
/// ///
/// ``` /// ```
/// #![feature(concat_idents)]
///
/// # fn main() {
/// fn foobar() -> int { 23 } /// fn foobar() -> int { 23 }
/// ///
/// let f = concat_idents!(foo, bar); /// let f = concat_idents!(foo, bar);
/// println!("{}", f()); /// println!("{}", f());
/// # }
/// ``` /// ```
#[macro_export] #[macro_export]
macro_rules! concat_idents( ($($e:ident),*) => ({ /* compiler built-in */ }) ) macro_rules! concat_idents( ($($e:ident),*) => ({ /* compiler built-in */ }) )