mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 22:28:59 +02:00
<!-- Please describe your changes on the following line: --> This PR removes the `util` crate. * Replaced the `spawn_named` and `clamp` functions by appropriate uses of `std:🧵:Builder::spawn`, `std::cmp::min` and `std::cmp::max`. * Moved `opts`, `prefs` and `resource_files` into a new `config` crate. * Moved `remutex` and `geometry` into their own crates. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because they are refactorings <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 4eb653817f87e5fb47de34356f558eb76ecbca9f --HG-- rename : servo/components/util/Cargo.toml => servo/components/config/Cargo.toml rename : servo/components/util/basedir.rs => servo/components/config/basedir.rs rename : servo/components/util/lib.rs => servo/components/config/lib.rs rename : servo/components/util/opts.rs => servo/components/config/opts.rs rename : servo/components/util/prefs.rs => servo/components/config/prefs.rs rename : servo/components/util/resource_files.rs => servo/components/config/resource_files.rs rename : servo/components/util/geometry.rs => servo/components/geometry/lib.rs rename : servo/components/util/remutex.rs => servo/components/remutex/lib.rs rename : servo/tests/unit/util/lib.rs => servo/tests/unit/servo_config/lib.rs rename : servo/tests/unit/util/opts.rs => servo/tests/unit/servo_config/opts.rs rename : servo/tests/unit/util/prefs.rs => servo/tests/unit/servo_config/prefs.rs rename : servo/tests/unit/util/remutex.rs => servo/tests/unit/servo_remutex/lib.rs
93 lines
2.5 KiB
Rust
93 lines
2.5 KiB
Rust
// Copyright 2015 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.
|
|
|
|
// These tests came from https://github.com/rust-lang/rust/blob/master/src/libstd/sys/common/remutex.rs
|
|
|
|
#![cfg(test)]
|
|
|
|
extern crate servo_remutex;
|
|
|
|
use servo_remutex::{ReentrantMutex, ReentrantMutexGuard};
|
|
use std::cell::RefCell;
|
|
use std::sync::Arc;
|
|
use std::thread;
|
|
|
|
#[test]
|
|
fn smoke() {
|
|
let m = ReentrantMutex::new(());
|
|
{
|
|
let a = m.lock().unwrap();
|
|
{
|
|
let b = m.lock().unwrap();
|
|
{
|
|
let c = m.lock().unwrap();
|
|
assert_eq!(*c, ());
|
|
}
|
|
assert_eq!(*b, ());
|
|
}
|
|
assert_eq!(*a, ());
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn is_mutex() {
|
|
let m = Arc::new(ReentrantMutex::new(RefCell::new(0)));
|
|
let m2 = m.clone();
|
|
let lock = m.lock().unwrap();
|
|
let child = thread::spawn(move || {
|
|
let lock = m2.lock().unwrap();
|
|
assert_eq!(*lock.borrow(), 4950);
|
|
});
|
|
for i in 0..100 {
|
|
let lock = m.lock().unwrap();
|
|
*lock.borrow_mut() += i;
|
|
}
|
|
drop(lock);
|
|
child.join().unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn trylock_works() {
|
|
let m = Arc::new(ReentrantMutex::new(()));
|
|
let m2 = m.clone();
|
|
let _lock = m.try_lock().unwrap();
|
|
let _lock2 = m.try_lock().unwrap();
|
|
thread::spawn(move || {
|
|
let lock = m2.try_lock();
|
|
assert!(lock.is_err());
|
|
}).join().unwrap();
|
|
let _lock3 = m.try_lock().unwrap();
|
|
}
|
|
|
|
pub struct Answer<'a>(pub ReentrantMutexGuard<'a, RefCell<u32>>);
|
|
impl<'a> Drop for Answer<'a> {
|
|
fn drop(&mut self) {
|
|
*self.0.borrow_mut() = 42;
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn poison_works() {
|
|
let m = Arc::new(ReentrantMutex::new(RefCell::new(0)));
|
|
let mc = m.clone();
|
|
let result = thread::spawn(move ||{
|
|
let lock = mc.lock().unwrap();
|
|
*lock.borrow_mut() = 1;
|
|
let lock2 = mc.lock().unwrap();
|
|
*lock.borrow_mut() = 2;
|
|
let _answer = Answer(lock2);
|
|
println!("Intentionally panicking.");
|
|
panic!("What the answer to my lifetimes dilemma is?");
|
|
}).join();
|
|
assert!(result.is_err());
|
|
let r = m.lock().err().unwrap().into_inner();
|
|
assert_eq!(*r.borrow(), 42);
|
|
}
|
|
|