mirror of
				https://github.com/rust-lang/rust.git
				synced 2025-11-03 22:49:17 +00:00 
			
		
		
		
	No longer track "zero-width" chars in `SourceMap`, read directly from the line when calculating the `display_col` of a `BytePos`. Move `char_width` to `rustc_span` and use it from the emitter.
This change allows the following to properly align in terminals (depending on the font, the replaced control codepoints are rendered as 1 or 2 width, on my terminal they are rendered as 1, on VSCode text they are rendered as 2):
```
error: this file contains an unclosed delimiter
  --> $DIR/issue-68629.rs:5:17
   |
LL | ␜␟ts␀![{i
   |       -- unclosed delimiter
   |       |
   |       unclosed delimiter
LL | ␀␀  fn rݻoa>rݻm
   |                ^
```
		
	
			
		
			
				
	
	
		
			43 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			TOML
		
	
	
	
	
	
			
		
		
	
	
			43 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			TOML
		
	
	
	
	
	
[package]
 | 
						|
name = "rustc_errors"
 | 
						|
version = "0.0.0"
 | 
						|
edition = "2021"
 | 
						|
 | 
						|
[dependencies]
 | 
						|
# tidy-alphabetical-start
 | 
						|
annotate-snippets = "0.10"
 | 
						|
derive_setters = "0.1.6"
 | 
						|
rustc_ast = { path = "../rustc_ast" }
 | 
						|
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
 | 
						|
rustc_data_structures = { path = "../rustc_data_structures" }
 | 
						|
rustc_error_codes = { path = "../rustc_error_codes" }
 | 
						|
rustc_error_messages = { path = "../rustc_error_messages" }
 | 
						|
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
 | 
						|
rustc_hir = { path = "../rustc_hir" }
 | 
						|
rustc_index = { path = "../rustc_index" }
 | 
						|
rustc_lint_defs = { path = "../rustc_lint_defs" }
 | 
						|
rustc_macros = { path = "../rustc_macros" }
 | 
						|
rustc_serialize = { path = "../rustc_serialize" }
 | 
						|
rustc_span = { path = "../rustc_span" }
 | 
						|
rustc_target = { path = "../rustc_target" }
 | 
						|
rustc_type_ir = { path = "../rustc_type_ir" }
 | 
						|
serde = { version = "1.0.125", features = [ "derive" ] }
 | 
						|
serde_json = "1.0.59"
 | 
						|
termcolor = "1.2.0"
 | 
						|
termize = "0.1.1"
 | 
						|
tracing = "0.1"
 | 
						|
# tidy-alphabetical-end
 | 
						|
 | 
						|
[target.'cfg(windows)'.dependencies.windows]
 | 
						|
version = "0.52.0"
 | 
						|
features = [
 | 
						|
    "Win32_Foundation",
 | 
						|
    "Win32_Security",
 | 
						|
    "Win32_System_Threading",
 | 
						|
]
 | 
						|
 | 
						|
[features]
 | 
						|
# tidy-alphabetical-start
 | 
						|
rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler']
 | 
						|
# tidy-alphabetical-end
 |