nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move from log to tracing

Browse Source
This commit is contained in:
Oliver Scherer 2020-07-24 20:42:00 +02:00
parent 6e87bacd37
commit ec7230fea2
38 changed files with 165 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
Cargo.lock
View File

@ -61,7 +61,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7"
dependencies = [ dependencies = [
"ansi_term", "ansi_term 0.11.0",
] ]
[[package]] [[package]]
@ -79,6 +79,15 @@ dependencies = [
"winapi 0.3.8", "winapi 0.3.8",
] ]
[[package]]
name = "ansi_term"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
dependencies = [
"winapi 0.3.8",
]
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.31" version = "1.0.31"
@ -496,7 +505,7 @@ version = "2.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
dependencies = [ dependencies = [
"ansi_term", "ansi_term 0.11.0",
"atty", "atty",
"bitflags", "bitflags",
"strsim", "strsim",
@ -616,12 +625,12 @@ dependencies = [
"glob", "glob",
"lazy_static", "lazy_static",
"libc", "libc",
"log",
"miow 0.3.3", "miow 0.3.3",
"regex", "regex",
"rustfix", "rustfix",
"serde", "serde",
"serde_json", "serde_json",
"tracing",
"walkdir", "walkdir",
"winapi 0.3.8", "winapi 0.3.8",
] ]
@ -1741,6 +1750,15 @@ dependencies = [
"tendril", "tendril",
] ]
[[package]]
name = "matchers"
version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
dependencies = [
"regex-automata",
]
[[package]] [[package]]
name = "matches" name = "matches"
version = "0.1.8" version = "0.1.8"
@ -2314,7 +2332,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427" checksum = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427"
dependencies = [ dependencies = [
"ansi_term", "ansi_term 0.11.0",
"ctor", "ctor",
"difference", "difference",
"output_vt100", "output_vt100",
@ -2678,6 +2696,16 @@ dependencies = [
"thread_local", "thread_local",
] ]
[[package]]
name = "regex-automata"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
dependencies = [
"byteorder",
"regex-syntax",
]
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.6.17" version = "0.6.17"
@ -3228,7 +3256,6 @@ name = "rustc_ast"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"log",
"rustc_data_structures", "rustc_data_structures",
"rustc_index", "rustc_index",
"rustc_lexer", "rustc_lexer",
@ -3237,13 +3264,13 @@ dependencies = [
"rustc_span", "rustc_span",
"scoped-tls", "scoped-tls",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
name = "rustc_ast_lowering" name = "rustc_ast_lowering"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_arena", "rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
@ -3255,6 +3282,7 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -3262,7 +3290,6 @@ name = "rustc_ast_passes"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"itertools 0.8.0", "itertools 0.8.0",
"log",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
"rustc_attr", "rustc_attr",
@ -3272,16 +3299,17 @@ dependencies = [
"rustc_parse", "rustc_parse",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"tracing",
] ]
[[package]] [[package]]
name = "rustc_ast_pretty" name = "rustc_ast_pretty"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_ast", "rustc_ast",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"tracing",
] ]
[[package]] [[package]]
@ -3304,7 +3332,6 @@ dependencies = [
name = "rustc_builtin_macros" name = "rustc_builtin_macros"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
"rustc_attr", "rustc_attr",
@ -3318,6 +3345,7 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -3327,7 +3355,6 @@ dependencies = [
"bitflags", "bitflags",
"flate2", "flate2",
"libc", "libc",
"log",
"measureme", "measureme",
"rustc-demangle", "rustc-demangle",
"rustc_ast", "rustc_ast",
@ -3347,6 +3374,7 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -3357,7 +3385,6 @@ dependencies = [
"cc", "cc",
"jobserver", "jobserver",
"libc", "libc",
"log",
"memmap", "memmap",
"num_cpus", "num_cpus",
"pathdiff", "pathdiff",
@ -3377,6 +3404,7 @@ dependencies = [
"rustc_symbol_mangling", "rustc_symbol_mangling",
"rustc_target", "rustc_target",
"tempfile", "tempfile",
"tracing",
] ]
[[package]] [[package]]
@ -3391,7 +3419,6 @@ dependencies = [
"jobserver", "jobserver",
"lazy_static", "lazy_static",
"libc", "libc",
"log",
"measureme", "measureme",
"once_cell", "once_cell",
"parking_lot 0.10.2", "parking_lot 0.10.2",
@ -3404,6 +3431,7 @@ dependencies = [
"smallvec 1.4.0", "smallvec 1.4.0",
"stable_deref_trait", "stable_deref_trait",
"stacker", "stacker",
"tracing",
"winapi 0.3.8", "winapi 0.3.8",
] ]
@ -3411,10 +3439,8 @@ dependencies = [
name = "rustc_driver" name = "rustc_driver"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"env_logger 0.7.1",
"lazy_static", "lazy_static",
"libc", "libc",
"log",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
"rustc_codegen_ssa", "rustc_codegen_ssa",
@ -3436,6 +3462,8 @@ dependencies = [
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"tracing",
"tracing-subscriber",
"winapi 0.3.8", "winapi 0.3.8",
] ]
@ -3449,12 +3477,12 @@ version = "0.0.0"
dependencies = [ dependencies = [
"annotate-snippets 0.8.0", "annotate-snippets 0.8.0",
"atty", "atty",
"log",
"rustc_data_structures", "rustc_data_structures",
"rustc_serialize", "rustc_serialize",
"rustc_span", "rustc_span",
"termcolor", "termcolor",
"termize", "termize",
"tracing",
"unicode-width", "unicode-width",
"winapi 0.3.8", "winapi 0.3.8",
] ]
@ -3463,7 +3491,6 @@ dependencies = [
name = "rustc_expand" name = "rustc_expand"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_ast", "rustc_ast",
"rustc_ast_passes", "rustc_ast_passes",
"rustc_ast_pretty", "rustc_ast_pretty",
@ -3477,6 +3504,7 @@ dependencies = [
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -3501,7 +3529,6 @@ name = "rustc_hir"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"log",
"rustc_ast", "rustc_ast",
"rustc_data_structures", "rustc_data_structures",
"rustc_index", "rustc_index",
@ -3510,6 +3537,7 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -3527,7 +3555,6 @@ dependencies = [
name = "rustc_incremental" name = "rustc_incremental"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rand 0.7.3", "rand 0.7.3",
"rustc_ast", "rustc_ast",
"rustc_data_structures", "rustc_data_structures",
@ -3538,6 +3565,7 @@ dependencies = [
"rustc_serialize", "rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"tracing",
] ]
[[package]] [[package]]
@ -3552,7 +3580,6 @@ dependencies = [
name = "rustc_infer" name = "rustc_infer"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_ast", "rustc_ast",
"rustc_data_structures", "rustc_data_structures",
"rustc_errors", "rustc_errors",
@ -3566,6 +3593,7 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -3573,7 +3601,6 @@ name = "rustc_interface"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"libc", "libc",
"log",
"once_cell", "once_cell",
"rustc-rayon", "rustc-rayon",
"rustc_ast", "rustc_ast",
@ -3609,6 +3636,7 @@ dependencies = [
"rustc_typeck", "rustc_typeck",
"smallvec 1.4.0", "smallvec 1.4.0",
"tempfile", "tempfile",
"tracing",
"winapi 0.3.8", "winapi 0.3.8",
] ]
@ -3623,7 +3651,6 @@ dependencies = [
name = "rustc_lint" name = "rustc_lint"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
"rustc_attr", "rustc_attr",
@ -3637,6 +3664,7 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"rustc_trait_selection", "rustc_trait_selection",
"tracing",
"unicode-security", "unicode-security",
] ]
@ -3665,7 +3693,6 @@ version = "0.0.0"
dependencies = [ dependencies = [
"flate2", "flate2",
"libc", "libc",
"log",
"memmap", "memmap",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
@ -3682,6 +3709,7 @@ dependencies = [
"rustc_target", "rustc_target",
"smallvec 1.4.0", "smallvec 1.4.0",
"stable_deref_trait", "stable_deref_trait",
"tracing",
"winapi 0.3.8", "winapi 0.3.8",
] ]
@ -3692,7 +3720,6 @@ dependencies = [
"bitflags", "bitflags",
"byteorder", "byteorder",
"chalk-ir", "chalk-ir",
"log",
"measureme", "measureme",
"polonius-engine", "polonius-engine",
"rustc-rayon-core", "rustc-rayon-core",
@ -3713,6 +3740,7 @@ dependencies = [
"rustc_target", "rustc_target",
"scoped-tls", "scoped-tls",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -3721,7 +3749,6 @@ version = "0.0.0"
dependencies = [ dependencies = [
"either", "either",
"itertools 0.8.0", "itertools 0.8.0",
"log",
"log_settings", "log_settings",
"polonius-engine", "polonius-engine",
"rustc_apfloat", "rustc_apfloat",
@ -3742,13 +3769,13 @@ dependencies = [
"rustc_target", "rustc_target",
"rustc_trait_selection", "rustc_trait_selection",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
name = "rustc_mir_build" name = "rustc_mir_build"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_apfloat", "rustc_apfloat",
"rustc_arena", "rustc_arena",
"rustc_ast", "rustc_ast",
@ -3765,6 +3792,7 @@ dependencies = [
"rustc_target", "rustc_target",
"rustc_trait_selection", "rustc_trait_selection",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -3772,7 +3800,6 @@ name = "rustc_parse"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"log",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
"rustc_data_structures", "rustc_data_structures",
@ -3781,6 +3808,7 @@ dependencies = [
"rustc_lexer", "rustc_lexer",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"tracing",
"unicode-normalization", "unicode-normalization",
] ]
@ -3796,7 +3824,6 @@ dependencies = [
name = "rustc_passes" name = "rustc_passes"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
"rustc_data_structures", "rustc_data_structures",
@ -3808,6 +3835,7 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"rustc_trait_selection", "rustc_trait_selection",
"tracing",
] ]
[[package]] [[package]]
@ -3828,7 +3856,6 @@ dependencies = [
name = "rustc_privacy" name = "rustc_privacy"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_attr", "rustc_attr",
"rustc_data_structures", "rustc_data_structures",
"rustc_errors", "rustc_errors",
@ -3837,13 +3864,13 @@ dependencies = [
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_typeck", "rustc_typeck",
"tracing",
] ]
[[package]] [[package]]
name = "rustc_query_system" name = "rustc_query_system"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"parking_lot 0.10.2", "parking_lot 0.10.2",
"rustc-rayon-core", "rustc-rayon-core",
"rustc_arena", "rustc_arena",
@ -3853,6 +3880,7 @@ dependencies = [
"rustc_serialize", "rustc_serialize",
"rustc_span", "rustc_span",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -3860,7 +3888,6 @@ name = "rustc_resolve"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"log",
"rustc_arena", "rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_ast_lowering", "rustc_ast_lowering",
@ -3877,13 +3904,13 @@ dependencies = [
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
name = "rustc_save_analysis" name = "rustc_save_analysis"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rls-data", "rls-data",
"rls-span", "rls-span",
"rustc_ast", "rustc_ast",
@ -3896,6 +3923,7 @@ dependencies = [
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"serde_json", "serde_json",
"tracing",
] ]
[[package]] [[package]]
@ -3912,7 +3940,6 @@ version = "0.0.0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"getopts", "getopts",
"log",
"num_cpus", "num_cpus",
"rustc_ast", "rustc_ast",
"rustc_data_structures", "rustc_data_structures",
@ -3922,6 +3949,7 @@ dependencies = [
"rustc_serialize", "rustc_serialize",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"tracing",
] ]
[[package]] [[package]]
@ -3929,7 +3957,6 @@ name = "rustc_span"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"log",
"md-5", "md-5",
"rustc_arena", "rustc_arena",
"rustc_data_structures", "rustc_data_structures",
@ -3938,6 +3965,7 @@ dependencies = [
"rustc_serialize", "rustc_serialize",
"scoped-tls", "scoped-tls",
"sha-1", "sha-1",
"tracing",
"unicode-width", "unicode-width",
] ]
@ -3945,7 +3973,6 @@ dependencies = [
name = "rustc_symbol_mangling" name = "rustc_symbol_mangling"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"punycode", "punycode",
"rustc-demangle", "rustc-demangle",
"rustc_ast", "rustc_ast",
@ -3955,6 +3982,7 @@ dependencies = [
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"tracing",
] ]
[[package]] [[package]]
@ -3962,12 +3990,12 @@ name = "rustc_target"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"log",
"rustc_data_structures", "rustc_data_structures",
"rustc_index", "rustc_index",
"rustc_macros", "rustc_macros",
"rustc_serialize", "rustc_serialize",
"rustc_span", "rustc_span",
"tracing",
] ]
[[package]] [[package]]
@ -3984,7 +4012,6 @@ checksum = "b725dadae9fabc488df69a287f5a99c5eaf5d10853842a8a3dfac52476f544ee"
name = "rustc_trait_selection" name = "rustc_trait_selection"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
"rustc_data_structures", "rustc_data_structures",
@ -3999,6 +4026,7 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -4007,7 +4035,6 @@ version = "0.0.0"
dependencies = [ dependencies = [
"chalk-ir", "chalk-ir",
"chalk-solve", "chalk-solve",
"log",
"rustc_ast", "rustc_ast",
"rustc_data_structures", "rustc_data_structures",
"rustc_hir", "rustc_hir",
@ -4017,13 +4044,13 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_trait_selection", "rustc_trait_selection",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
name = "rustc_ty" name = "rustc_ty"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_data_structures", "rustc_data_structures",
"rustc_errors", "rustc_errors",
"rustc_hir", "rustc_hir",
@ -4033,13 +4060,13 @@ dependencies = [
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"rustc_trait_selection", "rustc_trait_selection",
"tracing",
] ]
[[package]] [[package]]
name = "rustc_typeck" name = "rustc_typeck"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log",
"rustc_arena", "rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
@ -4055,6 +4082,7 @@ dependencies = [
"rustc_target", "rustc_target",
"rustc_trait_selection", "rustc_trait_selection",
"smallvec 1.4.0", "smallvec 1.4.0",
"tracing",
] ]
[[package]] [[package]]
@ -4284,6 +4312,15 @@ dependencies = [
"opaque-debug", "opaque-debug",
] ]
[[package]]
name = "sharded-slab"
version = "0.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06d5a3f5166fb5b42a5439f2eee8b9de149e235961e3eb21c5808fc3ea17ff3e"
dependencies = [
"lazy_static",
]
[[package]] [[package]]
name = "shell-escape" name = "shell-escape"
version = "0.1.4" version = "0.1.4"
@ -4931,9 +4968,9 @@ dependencies = [
[[package]] [[package]]
name = "tracing" name = "tracing"
version = "0.1.15" version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a41f40ed0e162c911ac6fcb53ecdc8134c46905fdbbae8c50add462a538b495f" checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"tracing-attributes", "tracing-attributes",
@ -4942,9 +4979,9 @@ dependencies = [
[[package]] [[package]]
name = "tracing-attributes" name = "tracing-attributes"
version = "0.1.8" version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99bbad0de3fd923c9c3232ead88510b783e5a4d16a6154adffa3d53308de984c" checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b"
dependencies = [ dependencies = [
"proc-macro2 1.0.3", "proc-macro2 1.0.3",
"quote 1.0.2", "quote 1.0.2",
@ -4953,13 +4990,54 @@ dependencies = [
[[package]] [[package]]
name = "tracing-core" name = "tracing-core"
version = "0.1.10" version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0aa83a9a47081cd522c09c81b31aec2c9273424976f922ad61c053b58350b715" checksum = "b2734b5a028fa697686f16c6d18c2c6a3c7e41513f9a213abb6754c4acb3c8d7"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
] ]
[[package]]
name = "tracing-log"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9"
dependencies = [
"lazy_static",
"log",
"tracing-core",
]
[[package]]
name = "tracing-serde"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6ccba2f8f16e0ed268fc765d9b7ff22e965e7185d32f8f1ec8294fe17d86e79"
dependencies = [
"serde",
"tracing-core",
]
[[package]]
name = "tracing-subscriber"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7b33f8b2ef2ab0c3778c12646d9c42a24f7772bee4cdafc72199644a9f58fdc"
dependencies = [
"ansi_term 0.12.1",
"chrono",
"lazy_static",
"matchers",
"regex",
"serde",
"serde_json",
"sharded-slab",
"smallvec 1.4.0",
"tracing-core",
"tracing-log",
"tracing-serde",
]
[[package]] [[package]]
name = "typenum" name = "typenum"
version = "1.12.0" version = "1.12.0"

2
src/librustc_ast/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
rustc_serialize = { path = "../librustc_serialize" } rustc_serialize = { path = "../librustc_serialize" }
log = "0.4" log = { package = "tracing", version = "0.1" }
scoped-tls = "1.0" scoped-tls = "1.0"
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }

2
src/librustc_ast_lowering/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
rustc_arena = { path = "../librustc_arena" } rustc_arena = { path = "../librustc_arena" }
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { package = "tracing", version = "0.1" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_hir = { path = "../librustc_hir" } rustc_hir = { path = "../librustc_hir" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }

2
src/librustc_ast_passes/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
[dependencies] [dependencies]
itertools = "0.8" itertools = "0.8"
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }

2
src/librustc_ast_pretty/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }

2
src/librustc_builtin_macros/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
rustc_parse_format = { path = "../librustc_parse_format" } rustc_parse_format = { path = "../librustc_parse_format" }
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }

2
src/librustc_codegen_llvm/Cargo.toml
View File

@ -15,7 +15,7 @@ bitflags = "1.0"
flate2 = "1.0" flate2 = "1.0"
libc = "0.2" libc = "0.2"
measureme = "0.7.1" measureme = "0.7.1"
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc-demangle = "0.1" rustc-demangle = "0.1"
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }

2
src/librustc_codegen_ssa/Cargo.toml
View File

@ -14,7 +14,7 @@ bitflags = "1.2.1"
cc = "1.0.1" cc = "1.0.1"
num_cpus = "1.0" num_cpus = "1.0"
memmap = "0.7" memmap = "0.7"
log = "0.4.5" log = { package = "tracing", version = "0.1" }
libc = "0.2.50" libc = "0.2.50"
jobserver = "0.1.11" jobserver = "0.1.11"
tempfile = "3.1" tempfile = "3.1"

2
src/librustc_data_structures/Cargo.toml
View File

@ -12,7 +12,7 @@ doctest = false
[dependencies] [dependencies]
ena = "0.14" ena = "0.14"
indexmap = "1" indexmap = "1"
log = "0.4" log = { package = "tracing", version = "0.1" }
jobserver_crate = { version = "0.1.13", package = "jobserver" } jobserver_crate = { version = "0.1.13", package = "jobserver" }
lazy_static = "1" lazy_static = "1"
once_cell = { version = "1", features = ["parking_lot"] } once_cell = { version = "1", features = ["parking_lot"] }

4
src/librustc_driver/Cargo.toml
View File

@ -12,8 +12,8 @@ crate-type = ["dylib"]
[dependencies] [dependencies]
lazy_static = "1.0" lazy_static = "1.0"
libc = "0.2" libc = "0.2"
log = "0.4" log = { package = "tracing", version = "0.1.18", features = ["release_max_level_info"] }
env_logger = { version = "0.7", default-features = false } tracing-subscriber = { version = "0.2.10", features = ["fmt", "env-filter"] }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }

6
src/librustc_driver/lib.rs
View File

@ -1226,7 +1226,11 @@ pub fn install_ice_hook() {
/// This allows tools to enable rust logging without having to magically match rustc's /// This allows tools to enable rust logging without having to magically match rustc's
/// log crate version /// log crate version
pub fn init_rustc_env_logger() { pub fn init_rustc_env_logger() {
env_logger::init_from_env("RUSTC_LOG"); let builder = tracing_subscriber::FmtSubscriber::builder();
let builder = builder.with_env_filter(tracing_subscriber::EnvFilter::from_env("RUSTC_LOG"));
builder.init()
} }
pub fn main() -> ! { pub fn main() -> ! {

2
src/librustc_errors/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_serialize = { path = "../librustc_serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }

2
src/librustc_expand/Cargo.toml
View File

@ -12,7 +12,7 @@ doctest = false
[dependencies] [dependencies]
rustc_serialize = { path = "../librustc_serialize" } rustc_serialize = { path = "../librustc_serialize" }
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_ast_passes = { path = "../librustc_ast_passes" } rustc_ast_passes = { path = "../librustc_ast_passes" }

2
src/librustc_hir/Cargo.toml
View File

@ -18,5 +18,5 @@ rustc_span = { path = "../librustc_span" }
rustc_serialize = { path = "../librustc_serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
lazy_static = "1" lazy_static = "1"
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { package = "tracing", version = "0.1" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] } smallvec = { version = "1.0", features = ["union", "may_dangle"] }

2
src/librustc_incremental/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
rustc_graphviz = { path = "../librustc_graphviz" } rustc_graphviz = { path = "../librustc_graphviz" }
log = "0.4" log = { package = "tracing", version = "0.1" }
rand = "0.7" rand = "0.7"
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }

2
src/librustc_infer/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
rustc_graphviz = { path = "../librustc_graphviz" } rustc_graphviz = { path = "../librustc_graphviz" }
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { package = "tracing", version = "0.1" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_errors = { path = "../librustc_errors" } rustc_errors = { path = "../librustc_errors" }

2
src/librustc_interface/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
libc = "0.2" libc = "0.2"
log = "0.4" log = { package = "tracing", version = "0.1" }
rayon = { version = "0.3.0", package = "rustc-rayon" } rayon = { version = "0.3.0", package = "rustc-rayon" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] } smallvec = { version = "1.0", features = ["union", "may_dangle"] }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }

2
src/librustc_lint/Cargo.toml
View File

@ -9,7 +9,7 @@ name = "rustc_lint"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
log = "0.4" log = { package = "tracing", version = "0.1" }
unicode-security = "0.0.5" unicode-security = "0.0.5"
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }

2
src/librustc_metadata/Cargo.toml
View File

@ -12,7 +12,7 @@ doctest = false
[dependencies] [dependencies]
flate2 = "1.0" flate2 = "1.0"
libc = "0.2" libc = "0.2"
log = "0.4" log = { package = "tracing", version = "0.1" }
memmap = "0.7" memmap = "0.7"
smallvec = { version = "1.0", features = ["union", "may_dangle"] } smallvec = { version = "1.0", features = ["union", "may_dangle"] }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }

2
src/librustc_middle/Cargo.toml
View File

@ -13,7 +13,7 @@ doctest = false
rustc_arena = { path = "../librustc_arena" } rustc_arena = { path = "../librustc_arena" }
bitflags = "1.2.1" bitflags = "1.2.1"
scoped-tls = "1.0" scoped-tls = "1.0"
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { package = "tracing", version = "0.1" }
rustc-rayon-core = "0.3.0" rustc-rayon-core = "0.3.0"
polonius-engine = "0.12.0" polonius-engine = "0.12.0"
rustc_apfloat = { path = "../librustc_apfloat" } rustc_apfloat = { path = "../librustc_apfloat" }

2
src/librustc_mir/Cargo.toml
View File

@ -13,7 +13,7 @@ doctest = false
either = "1.5.0" either = "1.5.0"
rustc_graphviz = { path = "../librustc_graphviz" } rustc_graphviz = { path = "../librustc_graphviz" }
itertools = "0.8" itertools = "0.8"
log = "0.4" log = { package = "tracing", version = "0.1" }
log_settings = "0.1.1" log_settings = "0.1.1"
polonius-engine = "0.12.0" polonius-engine = "0.12.0"
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }

3
src/librustc_mir/interpret/eval_context.rs
View File

@ -818,11 +818,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
) -> InterpResult<'tcx> { ) -> InterpResult<'tcx> {
// FIXME: should we tell the user that there was a local which was never written to? // FIXME: should we tell the user that there was a local which was never written to?
if let LocalValue::Live(Operand::Indirect(MemPlace { ptr, .. })) = local { if let LocalValue::Live(Operand::Indirect(MemPlace { ptr, .. })) = local {
trace!("deallocating local");
// All locals have a backing allocation, even if the allocation is empty // All locals have a backing allocation, even if the allocation is empty
// due to the local having ZST type. // due to the local having ZST type.
let ptr = ptr.assert_ptr(); let ptr = ptr.assert_ptr();
trace!("{:?}", self.memory.dump_alloc(ptr.alloc_id)); trace!("deallocating local: {:?}", self.memory.dump_alloc(ptr.alloc_id));
self.memory.deallocate_local(ptr)?; self.memory.deallocate_local(ptr)?;
}; };
Ok(()) Ok(())

2
src/librustc_mir_build/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
rustc_arena = { path = "../librustc_arena" } rustc_arena = { path = "../librustc_arena" }
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_apfloat = { path = "../librustc_apfloat" } rustc_apfloat = { path = "../librustc_apfloat" }
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }

2
src/librustc_parse/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
bitflags = "1.0" bitflags = "1.0"
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_feature = { path = "../librustc_feature" } rustc_feature = { path = "../librustc_feature" }

2
src/librustc_passes/Cargo.toml
View File

@ -9,7 +9,7 @@ name = "rustc_passes"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }

2
src/librustc_privacy/Cargo.toml
View File

@ -17,4 +17,4 @@ rustc_typeck = { path = "../librustc_typeck" }
rustc_session = { path = "../librustc_session" } rustc_session = { path = "../librustc_session" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
log = "0.4" log = { package = "tracing", version = "0.1" }

2
src/librustc_query_system/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
rustc_arena = { path = "../librustc_arena" } rustc_arena = { path = "../librustc_arena" }
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { package = "tracing", version = "0.1" }
rustc-rayon-core = "0.3.0" rustc-rayon-core = "0.3.0"
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_errors = { path = "../librustc_errors" } rustc_errors = { path = "../librustc_errors" }

2
src/librustc_resolve/Cargo.toml
View File

@ -12,7 +12,7 @@ doctest = false
[dependencies] [dependencies]
bitflags = "1.2.1" bitflags = "1.2.1"
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
rustc_arena = { path = "../librustc_arena" } rustc_arena = { path = "../librustc_arena" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }

2
src/librustc_save_analysis/Cargo.toml
View File

@ -9,7 +9,7 @@ name = "rustc_save_analysis"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }

2
src/librustc_session/Cargo.toml
View File

@ -11,7 +11,7 @@ path = "lib.rs"
[dependencies] [dependencies]
bitflags = "1.2.1" bitflags = "1.2.1"
getopts = "0.2" getopts = "0.2"
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_errors = { path = "../librustc_errors" } rustc_errors = { path = "../librustc_errors" }
rustc_feature = { path = "../librustc_feature" } rustc_feature = { path = "../librustc_feature" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }

2
src/librustc_span/Cargo.toml
View File

@ -18,6 +18,6 @@ rustc_arena = { path = "../librustc_arena" }
scoped-tls = "1.0" scoped-tls = "1.0"
unicode-width = "0.1.4" unicode-width = "0.1.4"
cfg-if = "0.1.2" cfg-if = "0.1.2"
log = "0.4" log = { package = "tracing", version = "0.1" }
sha-1 = "0.8" sha-1 = "0.8"
md-5 = "0.8" md-5 = "0.8"

2
src/librustc_symbol_mangling/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
log = "0.4" log = { package = "tracing", version = "0.1" }
punycode = "0.4.0" punycode = "0.4.0"
rustc-demangle = "0.1.16" rustc-demangle = "0.1.16"

2
src/librustc_target/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
[dependencies] [dependencies]
bitflags = "1.2.1" bitflags = "1.2.1"
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_macros = { path = "../librustc_macros" } rustc_macros = { path = "../librustc_macros" }
rustc_serialize = { path = "../librustc_serialize" } rustc_serialize = { path = "../librustc_serialize" }

2
src/librustc_trait_selection/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
rustc_parse_format = { path = "../librustc_parse_format" } rustc_parse_format = { path = "../librustc_parse_format" }
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { package = "tracing", version = "0.1" }
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }

2
src/librustc_traits/Cargo.toml
View File

@ -9,7 +9,7 @@ name = "rustc_traits"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
log = { version = "0.4" } log = { package = "tracing", version = "0.1" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_hir = { path = "../librustc_hir" } rustc_hir = { path = "../librustc_hir" }

2
src/librustc_ty/Cargo.toml
View File

@ -9,7 +9,7 @@ name = "rustc_ty"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_errors = { path = "../librustc_errors" } rustc_errors = { path = "../librustc_errors" }

2
src/librustc_typeck/Cargo.toml
View File

@ -12,7 +12,7 @@ doctest = false
[dependencies] [dependencies]
rustc_arena = { path = "../librustc_arena" } rustc_arena = { path = "../librustc_arena" }
log = "0.4" log = { package = "tracing", version = "0.1" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }

2
src/tools/compiletest/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2018"
diff = "0.1.10" diff = "0.1.10"
env_logger = { version = "0.7", default-features = false } env_logger = { version = "0.7", default-features = false }
getopts = "0.2" getopts = "0.2"
log = "0.4" log = { package = "tracing", version = "0.1" }
regex = "1.0" regex = "1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"