This commit cleans out a large amount of deprecated APIs from the standard library and some of the facade crates as well, updating all users in the compiler and in tests as it goes along.
104 lines
4 KiB
Rust
104 lines
4 KiB
Rust
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
#![feature(rand, core)]
|
|
|
|
use std::fs::File;
|
|
use std::io::prelude::*;
|
|
use std::iter::repeat;
|
|
use std::path::Path;
|
|
use std::process::Command;
|
|
use std::rand::{thread_rng, Rng};
|
|
use std::{char, env};
|
|
|
|
// creates a file with `fn main() { <random ident> }` and checks the
|
|
// compiler emits a span of the appropriate length (for the
|
|
// "unresolved name" message); currently just using the number of code
|
|
// points, but should be the number of graphemes (FIXME #7043)
|
|
|
|
fn random_char() -> char {
|
|
let mut rng = thread_rng();
|
|
// a subset of the XID_start Unicode table (ensuring that the
|
|
// compiler doesn't fail with an "unrecognised token" error)
|
|
let (lo, hi): (u32, u32) = match rng.gen_range(1u32, 4u32 + 1) {
|
|
1 => (0x41, 0x5a),
|
|
2 => (0xf8, 0x1ba),
|
|
3 => (0x1401, 0x166c),
|
|
_ => (0x10400, 0x1044f)
|
|
};
|
|
|
|
char::from_u32(rng.gen_range(lo, hi + 1)).unwrap()
|
|
}
|
|
|
|
fn main() {
|
|
let args: Vec<String> = env::args().collect();
|
|
let rustc = &args[1];
|
|
let tmpdir = Path::new(&args[2]);
|
|
let main_file = tmpdir.join("span_main.rs");
|
|
|
|
for _ in 0..100 {
|
|
let n = thread_rng().gen_range(3, 20);
|
|
|
|
{
|
|
let _ = write!(&mut File::create(&main_file).unwrap(),
|
|
"#![feature(non_ascii_idents)] fn main() {{ {} }}",
|
|
// random string of length n
|
|
(0..n).map(|_| random_char()).collect::<String>());
|
|
}
|
|
|
|
// rustc is passed to us with --out-dir and -L etc., so we
|
|
// can't exec it directly
|
|
let result = Command::new("sh")
|
|
.arg("-c")
|
|
.arg(&format!("{} {}",
|
|
rustc,
|
|
main_file.to_str()
|
|
.unwrap()))
|
|
.output().unwrap();
|
|
|
|
let err = String::from_utf8_lossy(&result.stderr);
|
|
|
|
// the span should end the line (e.g no extra ~'s)
|
|
let expected_span = format!("^{}\n", repeat("~").take(n - 1)
|
|
.collect::<String>());
|
|
assert!(err.contains(&expected_span));
|
|
}
|
|
|
|
// Test multi-column characters and tabs
|
|
{
|
|
let _ = write!(&mut File::create(&main_file).unwrap(),
|
|
r#"extern "路濫狼á́́" fn foo() {{}} extern "路濫狼á́" fn bar() {{}}"#);
|
|
}
|
|
|
|
// Extra characters. Every line is preceded by `filename:lineno <actual code>`
|
|
let offset = main_file.to_str().unwrap().len() + 3;
|
|
|
|
let result = Command::new("sh")
|
|
.arg("-c")
|
|
.arg(format!("{} {}",
|
|
rustc,
|
|
main_file.display()))
|
|
.output().unwrap();
|
|
|
|
let err = String::from_utf8_lossy(&result.stderr);
|
|
|
|
// Test both the length of the snake and the leading spaces up to it
|
|
|
|
// First snake is 8 ~s long, with 7 preceding spaces (excluding file name/line offset)
|
|
let expected_span = format!("\n{}^{}\n",
|
|
repeat(" ").take(offset + 7).collect::<String>(),
|
|
repeat("~").take(8).collect::<String>());
|
|
assert!(err.contains(&expected_span));
|
|
// Second snake is 8 ~s long, with 36 preceding spaces
|
|
let expected_span = format!("\n{}^{}\n",
|
|
repeat(" ").take(offset + 36).collect::<String>(),
|
|
repeat("~").take(8).collect::<String>());
|
|
assert!(err.contains(&expected_span));
|
|
}
|