@@ -1879,24 +1879,25 @@ fn doc_message_format() {
1879
1879
1880
1880
p. cargo ( "doc --message-format=json" )
1881
1881
. with_status ( 101 )
1882
- . with_json_contains_unordered (
1883
- r#"
1884
- {
1885
- "message": {
1886
- "$message_type": "diagnostic",
1887
- "children": "{...}",
1888
- "code": "{...}",
1889
- "level": "error",
1890
- "message": "{...}",
1891
- "rendered": "{...}",
1892
- "spans": "{...}"
1893
- },
1894
- "package_id": "path+file:///[..]/foo#0.0.1",
1895
- "manifest_path": "[..]",
1896
- "reason": "compiler-message",
1897
- "target": "{...}"
1898
- }
1899
- "# ,
1882
+ . with_stdout_data (
1883
+ str![ [ r##"
1884
+ [
1885
+ {
1886
+ "manifest_path": "[ROOT]/foo/Cargo.toml",
1887
+ "message": {
1888
+ "$message_type": "diagnostic",
1889
+ "level": "error",
1890
+ "...": "{...}"
1891
+ },
1892
+ "package_id": "path+[ROOTURL]/foo#0.0.1",
1893
+ "reason": "compiler-message",
1894
+ "target": "{...}"
1895
+ },
1896
+ "{...}"
1897
+ ]
1898
+ "## ] ]
1899
+ . is_json ( )
1900
+ . against_jsonlines ( ) ,
1900
1901
)
1901
1902
. run ( ) ;
1902
1903
}
@@ -1911,76 +1912,95 @@ fn doc_json_artifacts() {
1911
1912
. build ( ) ;
1912
1913
1913
1914
p. cargo ( "doc --message-format=json" )
1914
- . with_json_contains_unordered (
1915
- r#"
1916
- {
1917
- "reason": "compiler-artifact",
1918
- "package_id": "path+file:///[..]/foo#0.0.1",
1915
+ . with_stdout_data (
1916
+ str![ [ r#"
1917
+ [
1918
+ {
1919
+ "executable": null,
1920
+ "features": [],
1921
+ "filenames": [
1922
+ "[ROOT]/foo/target/debug/deps/libfoo-[HASH].rmeta"
1923
+ ],
1924
+ "fresh": false,
1919
1925
"manifest_path": "[ROOT]/foo/Cargo.toml",
1920
- "target":
1921
- {
1922
- "kind": ["lib"],
1923
- "crate_types": ["lib"],
1924
- "name": "foo",
1925
- "src_path": "[ROOT]/foo/src/lib.rs",
1926
- "edition": "2015",
1927
- "doc": true,
1928
- "doctest": true,
1929
- "test": true
1930
- },
1926
+ "package_id": "path+[ROOTURL]/foo#0.0.1",
1931
1927
"profile": "{...}",
1932
- "features": [],
1933
- "filenames": ["[ROOT]/foo/target/debug/deps/libfoo-[..].rmeta"],
1934
- "executable": null,
1935
- "fresh": false
1936
- }
1937
-
1938
- {
1939
1928
"reason": "compiler-artifact",
1940
- "package_id": "path+file:///[..]/foo#0.0.1",
1929
+ "target": {
1930
+ "crate_types": [
1931
+ "lib"
1932
+ ],
1933
+ "doc": true,
1934
+ "doctest": true,
1935
+ "edition": "2015",
1936
+ "kind": [
1937
+ "lib"
1938
+ ],
1939
+ "name": "foo",
1940
+ "src_path": "[ROOT]/foo/src/lib.rs",
1941
+ "test": true
1942
+ }
1943
+ },
1944
+ {
1945
+ "executable": null,
1946
+ "features": [],
1947
+ "filenames": [
1948
+ "[ROOT]/foo/target/doc/foo/index.html"
1949
+ ],
1950
+ "fresh": false,
1941
1951
"manifest_path": "[ROOT]/foo/Cargo.toml",
1942
- "target":
1943
- {
1944
- "kind": ["lib"],
1945
- "crate_types": ["lib"],
1946
- "name": "foo",
1947
- "src_path": "[ROOT]/foo/src/lib.rs",
1948
- "edition": "2015",
1949
- "doc": true,
1950
- "doctest": true,
1951
- "test": true
1952
- },
1952
+ "package_id": "path+[ROOTURL]/foo#0.0.1",
1953
1953
"profile": "{...}",
1954
- "features": [],
1955
- "filenames": ["[ROOT]/foo/target/doc/foo/index.html"],
1956
- "executable": null,
1957
- "fresh": false
1958
- }
1959
-
1960
- {
1961
1954
"reason": "compiler-artifact",
1962
- "package_id": "path+file:///[..]/foo#0.0.1",
1955
+ "target": {
1956
+ "crate_types": [
1957
+ "lib"
1958
+ ],
1959
+ "doc": true,
1960
+ "doctest": true,
1961
+ "edition": "2015",
1962
+ "kind": [
1963
+ "lib"
1964
+ ],
1965
+ "name": "foo",
1966
+ "src_path": "[ROOT]/foo/src/lib.rs",
1967
+ "test": true
1968
+ }
1969
+ },
1970
+ {
1971
+ "executable": null,
1972
+ "features": [],
1973
+ "filenames": [
1974
+ "[ROOT]/foo/target/doc/somebin/index.html"
1975
+ ],
1976
+ "fresh": false,
1963
1977
"manifest_path": "[ROOT]/foo/Cargo.toml",
1964
- "target":
1965
- {
1966
- "kind": ["bin"],
1967
- "crate_types": ["bin"],
1968
- "name": "somebin",
1969
- "src_path": "[ROOT]/foo/src/bin/somebin.rs",
1970
- "edition": "2015",
1971
- "doc": true,
1972
- "doctest": false,
1973
- "test": true
1974
- },
1978
+ "package_id": "path+[ROOTURL]/foo#0.0.1",
1975
1979
"profile": "{...}",
1976
- "features": [],
1977
- "filenames": ["[ROOT]/foo/target/doc/somebin/index.html"],
1978
- "executable": null,
1979
- "fresh": false
1980
- }
1981
-
1982
- {"reason":"build-finished","success":true}
1983
- "# ,
1980
+ "reason": "compiler-artifact",
1981
+ "target": {
1982
+ "crate_types": [
1983
+ "bin"
1984
+ ],
1985
+ "doc": true,
1986
+ "doctest": false,
1987
+ "edition": "2015",
1988
+ "kind": [
1989
+ "bin"
1990
+ ],
1991
+ "name": "somebin",
1992
+ "src_path": "[ROOT]/foo/src/bin/somebin.rs",
1993
+ "test": true
1994
+ }
1995
+ },
1996
+ {
1997
+ "reason": "build-finished",
1998
+ "success": true
1999
+ }
2000
+ ]
2001
+ "# ] ]
2002
+ . is_json ( )
2003
+ . against_jsonlines ( ) ,
1984
2004
)
1985
2005
. run ( ) ;
1986
2006
}
0 commit comments